MOBILEAPPS-2120 (#296)

* fixed move crash * fixed move crash
Alfresco · Oct 17, 2023 · f03d838 · f03d838
1 parent 9d03819
commit f03d838
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 21 deletions.
diff --git a/actions/src/main/kotlin/com/alfresco/content/actions/ActionMoveFragment.kt b/actions/src/main/kotlin/com/alfresco/content/actions/ActionMoveFragment.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.os.Bundle
 import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import com.alfresco.content.actions.MoveResultContract.Companion.ENTRY_OBJ_KEY
 import com.alfresco.content.data.Entry
 import com.alfresco.content.withNewFragment
@@ -15,21 +17,23 @@ import kotlinx.coroutines.suspendCancellableCoroutine
  */
 class ActionMoveFragment : Fragment() {
     private lateinit var requestLauncher: ActivityResultLauncher<Unit>
-    private var onResult: CancellableContinuation<String?>? = null
+    private lateinit var viewModel: ActionMoveViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        viewModel = ViewModelProvider(this)[ActionMoveViewModel::class.java]
+
         arguments?.let { bundle ->
             val entryObj = bundle.getParcelable(ENTRY_OBJ_KEY) as Entry?
             requestLauncher = registerForActivityResult(MoveResultContract(entryObj)) {
-                onResult?.resume(it, null)
+                viewModel.onResult?.resume(it, null)
             }
         }
     }
 
     private suspend fun moveItems(): String? =
         suspendCancellableCoroutine { continuation ->
-            onResult = continuation
+            viewModel.onResult = continuation
             requestLauncher.launch(Unit)
         }
 
@@ -57,3 +61,10 @@ class ActionMoveFragment : Fragment() {
         }
     }
 }
+
+/**
+ * ViewModel to retain the continuation
+ */
+class ActionMoveViewModel : ViewModel() {
+    var onResult: CancellableContinuation<String?>? = null
+}
diff --git a/actions/src/main/kotlin/com/alfresco/content/actions/MoveResultContract.kt b/actions/src/main/kotlin/com/alfresco/content/actions/MoveResultContract.kt
@@ -13,6 +13,10 @@ import com.alfresco.content.data.Entry
 class MoveResultContract(private val entryObj: Entry?) : ActivityResultContract<Unit, String?>() {
     @CallSuper
     override fun createIntent(context: Context, input: Unit): Intent {
+        val intent = Intent(
+            context,
+            Class.forName("com.alfresco.content.app.activity.MoveActivity"),
+        )
         intent.putExtra(ENTRY_OBJ_KEY, entryObj)
         return intent
     }
@@ -29,13 +33,5 @@ class MoveResultContract(private val entryObj: Entry?) : ActivityResultContract<
         const val OUTPUT_KEY = "targetParentId"
         const val ENTRY_OBJ_KEY = "entryObj"
         const val MOVE_ID_KEY = "moveId"
-        lateinit var intent: Intent
-
-        /**
-         * adding intent for MoveActivity
-         */
-        fun addMoveIntent(moveIntent: Intent) {
-            intent = moveIntent
-        }
     }
 }
diff --git a/app/src/main/java/com/alfresco/content/app/activity/MainActivity.kt b/app/src/main/java/com/alfresco/content/app/activity/MainActivity.kt
@@ -32,7 +32,6 @@ import com.alfresco.auth.activity.LoginViewModel
 import com.alfresco.auth.ui.observe
 import com.alfresco.content.actions.Action
 import com.alfresco.content.actions.ContextualActionsSheet
-import com.alfresco.content.actions.MoveResultContract
 import com.alfresco.content.activityViewModel
 import com.alfresco.content.app.R
 import com.alfresco.content.app.widget.ActionBarController
@@ -195,7 +194,7 @@ class MainActivity : AppCompatActivity(), MavericksView, ActionMode.Callback {
         bottomNav.setupWithNavController(navController)
 
         setupActionToasts()
-        MoveResultContract.addMoveIntent(Intent(this, MoveActivity::class.java))
+//        MoveResultContract.addMoveIntent(Intent(this, MoveActivity::class.java))
         setupDownloadNotifications()
 
         bottomNav.setOnItemSelectedListener { item ->

diff --git a/data/src/main/kotlin/com/alfresco/content/data/rooted/CheckForRootWorker.kt b/data/src/main/kotlin/com/alfresco/content/data/rooted/CheckForRootWorker.kt
@@ -2,7 +2,6 @@ package com.alfresco.content.data.rooted
 
 import android.content.Context
 import com.scottyab.rootbeer.RootBeer
-import com.scottyab.rootbeer.util.Utils
 
 class CheckForRootWorker(context: Context) {
 
@@ -16,12 +15,12 @@ class CheckForRootWorker(context: Context) {
         RootItemResult("Root Cloaking Apps", rootBeer.detectRootCloakingApps()),
         RootItemResult("TestKeys", rootBeer.detectTestKeys()),
         RootItemResult("BusyBoxBinary", rootBeer.checkForBusyBoxBinary()),
-        RootItemResult("SU Binary", rootBeer.checkForSuBinary()),
+//        RootItemResult("SU Binary", rootBeer.checkForSuBinary()),
         RootItemResult("2nd SU Binary check", rootBeer.checkSuExists()),
         RootItemResult("For RW Paths", rootBeer.checkForRWPaths()),
-        RootItemResult("Dangerous Props", rootBeer.checkForDangerousProps()),
+//        RootItemResult("Dangerous Props", rootBeer.checkForDangerousProps()),
         RootItemResult("Root via native check", rootBeer.checkForRootNative()),
-        RootItemResult("SE linux Flag Is Enabled", !Utils.isSelinuxFlagInEnabled()),
+//        RootItemResult("SE linux Flag Is Enabled", !Utils.isSelinuxFlagInEnabled()),
         RootItemResult("Magisk specific checks", rootBeer.checkForMagiskBinary()),
     )
 }
diff --git a/move/src/main/java/com/alfresco/content/move/MoveFragment.kt b/move/src/main/java/com/alfresco/content/move/MoveFragment.kt
@@ -1,5 +1,6 @@
 package com.alfresco.content.move
 
+import android.content.Context
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.fragment.app.Fragment
@@ -45,17 +46,26 @@ class MoveFragment : Fragment(), MavericksView {
     @OptIn(InternalMavericksApi::class)
     val viewModel: MoveViewModel by fragmentViewModelWithArgs { args }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        args = MoveArgs.with(requireArguments())
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        println("MoveFragment.onAttach")
+    }
 
+    override fun onStart() {
+        super.onStart()
+        println("MoveFragment.onStart")
         val nodeId = viewModel.getMyFilesNodeId()
         args.entryObj?.let {
             findNavController().navigateToMoveParent(nodeId, it.id, getString(R.string.browse_menu_personal))
         }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        println("MoveFragment.onCreate")
+        args = MoveArgs.with(requireArguments())
+    }
+
     override fun invalidate() = withState(viewModel) { state ->
     }
 }