Don't verify settings before it actually exists

HiddenRamblings · Sep 12, 2024 · 5d759e2 · 5d759e2
1 parent 7881540
commit 5d759e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         compileSdk 34
         minSdk 21
         targetSdk 34
-        versionName "4.2.5"
+        versionName "4.2.6"
         versionCode = versionName.replace(".","").toInteger() * 10
 
         vectorDrawables {

diff --git a/app/src/main/java/com/hiddenramblings/tagmo/fragment/BrowserFragment.kt b/app/src/main/java/com/hiddenramblings/tagmo/fragment/BrowserFragment.kt
@@ -230,7 +230,8 @@ class BrowserFragment : Fragment(), OnFoomiiboClickListener {
     }
 
     fun onConfigurationChanged() {
-        if (settings.amiiboView != BrowserSettings.VIEW.IMAGE.value) return
+        if (!this::settings.isInitialized || settings.amiiboView
+            != BrowserSettings.VIEW.IMAGE.value) return
         browserActivity?.let { activity ->
             browserContent?.layoutManager = GridLayoutManager(activity, activity.columnCount)
             foomiiboContent?.layoutManager = GridLayoutManager(activity, activity.columnCount)

diff --git a/app/src/main/java/com/hiddenramblings/tagmo/nfctech/NfcActivity.kt b/app/src/main/java/com/hiddenramblings/tagmo/nfctech/NfcActivity.kt
@@ -632,7 +632,6 @@ class NfcActivity : AppCompatActivity() {
                 } catch (ignored: IOException) {
                 }
             }
-            tagExpired = false
         }
     }
 
@@ -662,7 +661,7 @@ class NfcActivity : AppCompatActivity() {
         } catch (e: Exception) {
             Debug.warn(e)
             Debug.getExceptionCause(e)?.let { error ->
-
+                showError(error)
             } ?: {
                 showError(getString(R.string.error_unknown))
                 try {