🚑️ [Android] Fix potential NPE when moving assets

Author: AlexV525

android/src/main/kotlin/com/fluttercandies/photo_manager/core/utils/Android30DbUtils.kt

@@ -653,7 +653,7 @@ object Android30DbUtils : IDBUtils {
         }
     }
 
-    override fun getSomeInfo(context: Context, assetId: String): Pair<String, String>? {
+    override fun getSomeInfo(context: Context, assetId: String): Pair<String, String?>? {
         val cr = context.contentResolver
         val cursor = cr.query(
             allUri,
@@ -668,7 +668,7 @@ object Android30DbUtils : IDBUtils {
             }
             val galleryID = cursor.getString(0)
             val path = cursor.getString(1)
-            return Pair(galleryID, File(path).parent!!)
+            return Pair(galleryID, File(path).parent)
         }
     }
 

android/src/main/kotlin/com/fluttercandies/photo_manager/core/utils/AndroidQDBUtils.kt

@@ -673,7 +673,7 @@ object AndroidQDBUtils : IDBUtils {
         }
     }
 
-    override fun getSomeInfo(context: Context, assetId: String): Pair<String, String>? {
+    override fun getSomeInfo(context: Context, assetId: String): Pair<String, String?>? {
         val cursor = context.contentResolver.query(
             allUri,
             arrayOf(BUCKET_ID, RELATIVE_PATH),
@@ -687,7 +687,7 @@ object AndroidQDBUtils : IDBUtils {
             }
             val galleryID = cursor.getString(0)
             val path = cursor.getString(1)
-            return Pair(galleryID, File(path).parent!!)
+            return Pair(galleryID, File(path).parent)
         }
     }
 

android/src/main/kotlin/com/fluttercandies/photo_manager/core/utils/DBUtils.kt

@@ -664,25 +664,21 @@ object DBUtils : IDBUtils {
      * 0 : gallery id
      * 1 : current asset parent path
      */
-    override fun getSomeInfo(context: Context, assetId: String): Pair<String, String>? {
+    override fun getSomeInfo(context: Context, assetId: String): Pair<String, String?>? {
         val cursor = context.contentResolver.query(
             allUri,
             arrayOf(MediaStore.Files.FileColumns.BUCKET_ID, MediaStore.Files.FileColumns.DATA),
             "${MediaStore.Files.FileColumns._ID} = ?",
             arrayOf(assetId),
             null
-        )
-            ?: return null
-
+        ) ?: return null
         cursor.use {
             if (!cursor.moveToNext()) {
                 return null
             }
-
             val galleryID = cursor.getString(0)
             val path = cursor.getString(1)
-
-            return Pair(galleryID, File(path).parent!!)
+            return Pair(galleryID, File(path).parent)
         }
     }
 

android/src/main/kotlin/com/fluttercandies/photo_manager/core/utils/IDBUtils.kt

@@ -358,7 +358,7 @@ interface IDBUtils {
 
     fun moveToGallery(context: Context, assetId: String, galleryId: String): AssetEntity?
 
-    fun getSomeInfo(context: Context, assetId: String): Pair<String, String>?
+    fun getSomeInfo(context: Context, assetId: String): Pair<String, String?>?
 
     fun getUri(id: String, type: Int, isOrigin: Boolean = false): Uri {
         var uri = when (type) {