Merge pull request #126 from TeamAmaze/feature

Fix for trashbin during init; bump version
TeamAmaze · Aug 30, 2023 · 1ddf5a3 · 1ddf5a3
2 parents 18bfc26 + 7d60249
commit 1ddf5a3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,8 +52,8 @@ android {
         minSdk 21
         targetSdk 32
 
-        Integer sudoVersionCode = 28
-        String versionNameText = "1.88"
+        Integer sudoVersionCode = 29
+        String versionNameText = "1.89"
 
         String[] abiFilterList = property("abiFilters").toString().split(';')
         Integer minorVersion = 0

diff --git a/app/src/main/java/com/amaze/fileutilities/home_page/ui/files/FilesViewModel.kt b/app/src/main/java/com/amaze/fileutilities/home_page/ui/files/FilesViewModel.kt
@@ -100,6 +100,7 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
+import java.lang.NullPointerException
 import java.lang.ref.WeakReference
 import java.net.InetSocketAddress
 import java.net.Socket
@@ -2218,14 +2219,20 @@ class FilesViewModel(val applicationContext: Application) :
             trashBinFilesLiveData = MutableLiveData()
             trashBinFilesLiveData?.value = null
             viewModelScope.launch(Dispatchers.IO) {
-                trashBinFilesLiveData?.postValue(
-                    ArrayList(
-                        getTrashBinInstance().listFilesInBin()
-                            .map {
-                                MediaFileInfo.fromTrashBinFile(it, getTrashbinConfig())
-                            }
+                try {
+                    trashBinFilesLiveData?.postValue(
+                        ArrayList(
+                            getTrashBinInstance().listFilesInBin()
+                                .map {
+                                    MediaFileInfo.fromTrashBinFile(it, getTrashbinConfig())
+                                }
+                        )
                     )
-                )
+                } catch (e: NullPointerException) {
+                    log.warn("failed to init trashbin livedata", e)
+                    val metadataPath = File(TRASH_BIN_BASE_PATH, "metadata.json")
+                    metadataPath.delete()
+                }
             }
         }
         return trashBinFilesLiveData!!