Floating button code moved

Keddnyo · Mar 9, 2022 · 7dc5c29 · 7dc5c29
1 parent ba905c2
commit 7dc5c29
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "io.github.keddnyo.amazware"
         minSdk 21
         targetSdk 32
-        versionCode 5
-        versionName "1.3.1"
+        versionCode 6
+        versionName "1.3.2"
     }
 
     buildTypes {

diff --git a/app/src/main/java/io/github/keddnyo/amazware/activities/Firmwarehouse.kt b/app/src/main/java/io/github/keddnyo/amazware/activities/Firmwarehouse.kt
@@ -44,25 +44,41 @@ class Firmwarehouse : AppCompatActivity() {
         init(true)
     }
 
-    @SuppressLint("SetJavaScriptEnabled")
-    fun init(common: Boolean) {
+    override fun onResume() {
+        super.onResume()
+
         val sharedPreferences =
             PreferenceManager.getDefaultSharedPreferences(this)
-        val darkMode = DarkMode().switch(this) // Set theme
-        val webView = findViewById<WebView>(R.id.webView)
-        val webSettings = webView?.settings
-        val refresh = findViewById<SwipeRefreshLayout>(R.id.cloud_refresh)
         val floatingButton = findViewById<FloatingActionButton>(R.id.favouriteButtonFirmwarehouse)
 
-        refresh.isRefreshing = true
-
         if ((sharedPreferences.getString("deviceSource", "") != "")
         ) {
             floatingButton.visibility = View.VISIBLE
         } else {
             floatingButton.visibility = View.GONE
         }
 
+        floatingButton.setOnClickListener {
+            init(false) // Loading favourite device page
+        }
+
+        floatingButton.setOnLongClickListener {
+            init(true) // Loading the main page
+            true
+        }
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    fun init(common: Boolean) {
+        val darkMode = DarkMode().switch(this) // Set theme
+        val webView = findViewById<WebView>(R.id.webView)
+        val webSettings = webView?.settings
+        val refresh = findViewById<SwipeRefreshLayout>(R.id.cloud_refresh)
+
+        refresh.isRefreshing = true
+
+        webView.clearHistory()
+        webView.clearCache(true)
         webSettings!!.javaScriptEnabled = true
 
         if (common) {
@@ -122,15 +138,6 @@ class Firmwarehouse : AppCompatActivity() {
             webView.reload()
             refresh.isRefreshing = false
         }
-
-        floatingButton.setOnClickListener {
-            init(false) // Loading favourite device page
-        }
-
-        floatingButton.setOnLongClickListener {
-            init(true) // Loading the main page
-            true
-        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {