Fixed app crashing when deleting cache/download

tom5079 · Aug 4, 2020 · 6ebc386 · 6ebc386
1 parent 3e657bd
commit 6ebc386
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,7 +20,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 57
-        versionName "4.20"
+        versionName "4.20-hotfix1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 57,
-      "versionName": "4.20",
+      "versionName": "4.20-hotfix1",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
@@ -82,7 +82,7 @@ class SettingsFragment :
         return getString(R.string.settings_storage_usage,
             Runtime.getRuntime().exec("du -hs " + dir.absolutePath).let {
                 BufferedReader(InputStreamReader(it.inputStream)).use { reader ->
-                    reader.readLine().split('\t').firstOrNull() ?: "0"
+                    reader.readLine()?.split('\t')?.firstOrNull() ?: "0"
                 }
             }
         )
@@ -106,11 +106,13 @@ class SettingsFragment :
                             if (dir.exists())
                                 dir.deleteRecursively()
 
-                            CoroutineScope(Dispatchers.IO).launch {
-                                summary = getString(R.string.settings_storage_usage_loading)
+                            summary = getString(R.string.settings_storage_usage_loading)
 
-                                launch(Dispatchers.Main) {
-                                    this@with.summary = getDirSize(dir)
+                            CoroutineScope(Dispatchers.IO).launch {
+                                getDirSize(dir).let {
+                                    launch(Dispatchers.Main) {
+                                        this@with.summary = getDirSize(dir)
+                                    }
                                 }
                             }
                         }
@@ -127,11 +129,13 @@ class SettingsFragment :
                             if (dir.exists())
                                 dir.deleteRecursively()
 
-                            CoroutineScope(Dispatchers.IO).launch {
-                                summary = getString(R.string.settings_storage_usage_loading)
+                            summary = getString(R.string.settings_storage_usage_loading)
 
-                                launch(Dispatchers.Main) {
-                                    this@with.summary = getDirSize(dir)
+                            CoroutineScope(Dispatchers.IO).launch {
+                                getDirSize(dir).let {
+                                    launch(Dispatchers.Main) {
+                                        this@with.summary = getDirSize(dir)
+                                    }
                                 }
                             }
                         }