From 5d759e23d2b40e3bfcd7bfbd1bc1e066611b437e Mon Sep 17 00:00:00 2001
From: TwistedUmbrellaX <twistedumbrella@gmail.com>
Date: Thu, 12 Sep 2024 00:29:23 -0400
Subject: [PATCH] Don't verify settings before it actually exists

---
 app/build.gradle                                               | 2 +-
 .../java/com/hiddenramblings/tagmo/fragment/BrowserFragment.kt | 3 ++-
 .../main/java/com/hiddenramblings/tagmo/nfctech/NfcActivity.kt | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fbfc167d4..f03517417 100644
--- 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
index 44bfb44ac..6ef0a57a5 100644
--- 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
index f14d8846b..5a205fca1 100644
--- 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 {