Fix FileDestinationPickerActivity

Author: w2sv

core/datastore/src/main/kotlin/com/w2sv/datastore/proto/navigatorconfig/NavigatorConfigMapper.kt

@@ -1,6 +1,5 @@
 package com.w2sv.datastore.proto.navigatorconfig
 
-import com.w2sv.common.util.map
 import com.w2sv.datastore.AutoMoveConfigProto
 import com.w2sv.datastore.FileTypeConfigProto
 import com.w2sv.datastore.NavigatorConfigProto
@@ -18,6 +17,7 @@ import com.w2sv.domain.model.navigatorconfig.AutoMoveConfig
 import com.w2sv.domain.model.navigatorconfig.FileTypeConfig
 import com.w2sv.domain.model.navigatorconfig.NavigatorConfig
 import com.w2sv.domain.model.navigatorconfig.SourceConfig
+import com.w2sv.kotlinutils.map
 
 fun NavigatorConfig.toProto(hasBeenMigrated: Boolean): NavigatorConfigProto =
     NavigatorConfigMapper.toProto(this, hasBeenMigrated)

core/navigator/src/main/kotlin/com/w2sv/navigator/moving/api/activity/AbstractDestinationPickerActivity.kt

@@ -31,7 +31,7 @@ internal abstract class AbstractDestinationPickerActivity : AbstractMoveActivity
         val pickerStartDestination: DocumentUri?
 
         companion object {
-            const val EXTRA = "com.w2sv.navigator.extra.DestinationPickerActivity.Args"
+            const val EXTRA = "com.w2sv.navigator.extra.AbstractDestinationPickerActivity.Args"
         }
     }
 

core/navigator/src/main/kotlin/com/w2sv/navigator/notifications/appnotifications/movefile/FileDestinationPickerActivity.kt

@@ -48,28 +48,33 @@ internal class FileDestinationPickerActivity : AbstractDestinationPickerActivity
         documentCreator.launch(args.moveFile.mediaStoreFileData.name)
     }
 
-    private val documentCreator = registerForActivityResult(
-        object :
-            ActivityResultContracts.CreateDocument(args.moveFile.fileType.simpleStorageMediaType.mimeType) {
-            override fun createIntent(context: Context, input: String): Intent {
-                return super.createIntent(context, input)
-                    .addCategory(Intent.CATEGORY_OPENABLE)
-                    .apply {
-                        // Set picker start location
-                        intent.putExtra(
-                            DocumentsContract.EXTRA_INITIAL_URI,
-                            args.pickerStartDestination?.uri
-                        )
-                    }
-            }
-        },
-        callback = { contentUri ->
-            if (contentUri != null) {
-                onDocumentCreated(contentUri)
+    /**
+     * Must be lazy, as it accesses [args], which depend on the activity's [getIntent] being non-null, which is only guaranteed [onCreate].
+     * Will be initialized during [onCreate], which calls [launchPicker].
+     */
+    private val documentCreator by threadUnsafeLazy {
+        registerForActivityResult(
+            object :
+                ActivityResultContracts.CreateDocument(args.moveFile.fileType.simpleStorageMediaType.mimeType) {
+                override fun createIntent(context: Context, input: String): Intent =
+                    super.createIntent(context, input)
+                        .addCategory(Intent.CATEGORY_OPENABLE)
+                        .apply {
+                            // Set picker start location
+                            intent.putExtra(
+                                DocumentsContract.EXTRA_INITIAL_URI,
+                                args.pickerStartDestination?.uri
+                            )
+                        }
+            },
+            callback = { contentUri ->
+                if (contentUri != null) {
+                    onDocumentCreated(contentUri)
+                }
+                finishAndRemoveTask()
             }
-            finishAndRemoveTask()
-        }
-    )
+        )
+    }
 
     /**
      * @param contentUri E.g.: __content://com.android.externalstorage.documents/document/primary%3AMoved%2FScreenshots%2FScreenshot_2024-09-08-01-29-28-913_com.w2sv.filenavigator.debug.jpg__
@@ -97,7 +102,7 @@ internal class FileDestinationPickerActivity : AbstractDestinationPickerActivity
                 }
             }
 
-        MoveBroadcastReceiver.Companion.sendBroadcast(
+        MoveBroadcastReceiver.sendBroadcast(
             moveBundle = MoveBundle.FileDestinationPicked(
                 file = args.moveFile,
                 destination = destination,