Merge pull request #18 from KiARC/dev

Small Patches
KiARC · Mar 30, 2022 · 988fa7e · 988fa7e
2 parents 1129ac0 + ee74e6a
commit 988fa7e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.katiearose.sobriety"
         minSdk 30
         targetSdk 30
-        versionCode 8
-        versionName "v4.0.0"
+        versionCode 9
+        versionName "v4.0.1"
         setProperty("archivesBaseName", "Sobriety $versionName")
     }
 

diff --git a/app/src/main/java/com/katiearose/sobriety/Main.kt b/app/src/main/java/com/katiearose/sobriety/Main.kt
@@ -190,27 +190,26 @@ class Main : AppCompatActivity() {
                 createNewCard(addiction)
             }
         } catch (e: ClassCastException) {
-            readCache(cache.inputStream())
+            readLegacyCache(cache.inputStream())
         }
     }
 
-    @Deprecated(
-        "For old caches before the implementation of the Addiction class.",
-        ReplaceWith("readCache(FileInputStream)"),
-        DeprecationLevel.WARNING
-    )
     private fun readLegacyCache(input: InputStream) {
-        val a = HashMap<String, Pair<Instant, CircularBuffer<Long>>>()
-        InflaterInputStream(input).use { iis ->
-            ObjectInputStream(iis).use {
-                for (i in it.readObject() as HashMap<String, Pair<Instant, CircularBuffer<Long>>>) {
-                    a[i.key] = i.value
+        try {
+            val a = HashMap<String, Pair<Instant, CircularBuffer<Long>>>()
+            InflaterInputStream(input).use { iis ->
+                ObjectInputStream(iis).use {
+                    for (i in it.readObject() as HashMap<String, Pair<Instant, CircularBuffer<Long>>>) {
+                        a[i.key] = i.value
+                    }
                 }
             }
-        }
-        for (ad in a) {
-            val addiction = Addiction(ad.key, ad.value.first)
-            createNewCard(addiction)
+            for (ad in a) {
+                val addiction = Addiction(ad.key, ad.value.first)
+                createNewCard(addiction)
+            }
+        } catch (e: Exception) {
+            //Do nothing, i.e. if the cache is older than the previous version just ignore it, supporting every previous version would take more code than it's worth.
         }
     }
 

diff --git a/fastlane/metadata/android/en-US/changelogs/9.txt b/fastlane/metadata/android/en-US/changelogs/9.txt
@@ -0,0 +1,3 @@
+Bug fixes
+- App no longer crashes when reading old caches
+- Caches older than the v3.x.x format are ignored