update flags mechanic

DerTyp7214 · Jul 18, 2021 · ab460e3 · ab460e3
1 parent a010e9a
commit ab460e3
Show file tree

Hide file tree

Showing 5 changed files with 290 additions and 278 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "de.dertyp7214.rboardthememanager"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 312
-        versionName "3.1.2"
+        versionCode 313
+        versionName "3.1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/core/JSON.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/core/JSON.kt
@@ -53,6 +53,14 @@ class SafeJSON(private val json: JSONObject) {
             defaultValue
         }
     }
+
+    override fun toString(): String {
+        return try {
+            json.toString(2)
+        } catch (e: Exception) {
+            ""
+        }
+    }
 }
 
 fun JSONObject.safeParse(string: String): JSONObject {

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/SplashScreen.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/SplashScreen.kt
@@ -62,33 +62,34 @@ class SplashScreen : AppCompatActivity() {
         }
 
         File(applicationInfo.dataDir, "flags.json").apply {
+            val timeStamp = let {
+                if (!it.exists()) -1
+                else SafeJSON(JSONObject(it.readText())).getLong("time", -1)
+            }
             doAsync(URL("https://raw.githubusercontent.com/AkosPaha/Rboard-ColorsTheme/master/flags-R.json")::getTextFromUrl) {
                 if (it.isBlank()) {
-                    if (!exists() || lastModified() < packageManager.getPackageInfo(
-                            packageName,
-                            0
-                        ).lastUpdateTime
-                    ) {
+                    if (!exists()) {
                         writeText(
-                            resources.openRawResource(
-                                FileUtils.getResourceId(
-                                    this@SplashScreen,
-                                    "flags",
-                                    "raw",
-                                    packageName
-                                )
-                            ).bufferedReader().use { reader -> reader.readText() }
+                            SafeJSON(
+                                JSONObject(resources.openRawResource(
+                                    FileUtils.getResourceId(
+                                        this@SplashScreen,
+                                        "flags",
+                                        "raw",
+                                        packageName
+                                    )
+                                ).bufferedReader().use { reader -> reader.readText() })
+                            ).toString()
                         )
                     }
                 } else {
                     val json = SafeJSON(JSONObject(it))
-                    if (!exists() || lastModified() < json.getLong("time"))
-                        writeText(json.getJSONArray("flags").toString())
+                    if (!exists() || timeStamp < json.getLong("time"))
+                        writeText(json.toString())
                 }
             }
         }
 
-
         val scheme = intent.scheme
         val data = intent.data
 
@@ -215,4 +216,4 @@ class SplashScreen : AppCompatActivity() {
         notificationManager.createNotificationChannel(channelPush)
         notificationManager.createNotificationChannel(channelDownload)
     }
-}
+}
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/Flags.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/Flags.kt
@@ -256,7 +256,7 @@ class Flags(val context: Context) {
 
             val json = File(context.applicationInfo.dataDir, "flags.json").let {
                 if (!it.exists()) null
-                else JSONArray(it.readText())
+                else it.readText().let { text -> SafeJSON(JSONObject(text)).getJSONArray("flags") }
             }
 
             json?.forEach<JSONObject> { obj, _ ->