From 7cfa6c163f9f1f543a59185a3dd357c010fd2dac Mon Sep 17 00:00:00 2001 From: Koen J Date: Mon, 18 Nov 2024 12:48:02 +0100 Subject: [PATCH] Use SINGLE_TOP instead of CLEAR_TOP and do not start a new task for import data. --- app/src/main/java/com/futo/platformplayer/Settings.kt | 1 - .../com/futo/platformplayer/activities/MainActivity.kt | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt index ff80acd3..30d96683 100644 --- a/app/src/main/java/com/futo/platformplayer/Settings.kt +++ b/app/src/main/java/com/futo/platformplayer/Settings.kt @@ -150,7 +150,6 @@ class Settings : FragmentedStorageFileJson() { fun import() { val act = SettingsActivity.getActivity() ?: return; val intent = MainActivity.getImportOptionsIntent(act); - intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK; act.startActivity(intent); } diff --git a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt index e4efd6c6..3f6c38bd 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt @@ -1231,28 +1231,28 @@ class MainActivity : AppCompatActivity, IWithResultLauncher { val sourcesIntent = Intent(context, MainActivity::class.java); sourcesIntent.action = "TAB"; sourcesIntent.putExtra("TAB", tab); - sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); return sourcesIntent; } fun getVideoIntent(context: Context, videoUrl: String) : Intent { val sourcesIntent = Intent(context, MainActivity::class.java); sourcesIntent.action = "VIDEO"; sourcesIntent.putExtra("VIDEO", videoUrl); - sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); return sourcesIntent; } fun getActionIntent(context: Context, action: String) : Intent { val sourcesIntent = Intent(context, MainActivity::class.java); sourcesIntent.action = "ACTION"; sourcesIntent.putExtra("ACTION", action); - sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); return sourcesIntent; } fun getImportOptionsIntent(context: Context): Intent { val sourcesIntent = Intent(context, MainActivity::class.java); sourcesIntent.action = "IMPORT_OPTIONS"; - sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); return sourcesIntent; } }