From a98154101bb130ad24571076e6834c62d69e2e13 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Mon, 16 Sep 2024 20:57:15 +0200 Subject: [PATCH] revert MainActivity launchMode again (#4685) This fixes - The problem where Tusky drops your draft when you switch apps while composing - The problem where MainActivity does not restart when switching theme in preferences This adds back a bug where one can have multiple instances of MainActivity which can behave weirdly when the active account was switched after they were created. This bug is (unlike the timeline mixup one) transient though, it will go away when restarting the app. As a small mitigation MainActivity is finished when forwarding to ComposeActivity (Tusky 25 behavior). --- app/src/main/AndroidManifest.xml | 1 - app/src/main/java/com/keylesspalace/tusky/MainActivity.kt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 668d0ba30..db8ee5182 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,6 @@ android:name=".MainActivity" android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize" android:exported="true" - android:launchMode="singleTask" android:theme="@style/SplashTheme"> diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt index 1e6c1e4b6..af2ba7ac3 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt @@ -576,6 +576,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { } } startActivity(composeIntent) + finish() } private fun setupDrawer(