Fixes recreating the new post screen from intent when switching accou…

…nts.
vitorpamplona · Oct 16, 2024 · c5dd2c5 · c5dd2c5
1 parent 236ff2d
commit c5dd2c5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
@@ -140,7 +140,10 @@ class Amethyst : Application() {
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
         println("Trim Memory $level")
-        GlobalScope.launch(Dispatchers.Default) { serviceManager.trimMemory() }
+        GlobalScope.launch(Dispatchers.Default) {
+            println("Trim Memory Inside $level")
+            serviceManager.trimMemory()
+        }
     }
 
     companion object {

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
@@ -336,13 +336,25 @@ private fun NavigateIfIntentRequested(
     var newAccount by remember { mutableStateOf<String?>(null) }
 
     if (activity.intent.action == Intent.ACTION_SEND) {
-        activity.intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
-            nav.newStack(buildNewPostRoute(draftMessage = it))
+        // saves the intent to avoid processing again
+        var message by remember {
+            mutableStateOf(
+                activity.intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
+                    it.ifBlank { null }
+                },
+            )
         }
 
-        (activity.intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
-            nav.newStack(buildNewPostRoute(attachment = it))
+        var media by remember {
+            mutableStateOf(
+                (activity.intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri),
+            )
         }
+
+        nav.newStack(buildNewPostRoute(draftMessage = message, attachment = media))
+
+        media = null
+        message = null
     } else {
         var currentIntentNextPage by remember {
             mutableStateOf(