diff --git a/app/src/main/java/com/tangem/tap/common/finisher/AndroidAppFinisher.kt b/app/src/main/java/com/tangem/tap/common/finisher/AndroidAppFinisher.kt index f0b9f5f66d..dc15eb3e95 100644 --- a/app/src/main/java/com/tangem/tap/common/finisher/AndroidAppFinisher.kt +++ b/app/src/main/java/com/tangem/tap/common/finisher/AndroidAppFinisher.kt @@ -1,12 +1,15 @@ package com.tangem.tap.common.finisher +import android.content.Context import android.content.Intent import com.tangem.core.navigation.finisher.AppFinisher import com.tangem.tap.MainActivity import com.tangem.tap.foregroundActivityObserver import com.tangem.tap.withForegroundActivity -internal class AndroidAppFinisher : AppFinisher { +internal class AndroidAppFinisher( + private val appContext: Context, +) : AppFinisher { override fun finish() { foregroundActivityObserver.withForegroundActivity { activity -> @@ -15,14 +18,9 @@ internal class AndroidAppFinisher : AppFinisher { } override fun restart() { - foregroundActivityObserver.withForegroundActivity { activity -> - activity.finish() - - val intent = Intent(activity, MainActivity::class.java).apply { - flags = Intent.FLAG_ACTIVITY_CLEAR_TOP - } - activity.startActivity(intent) - Runtime.getRuntime().exit(0) + val intent = Intent(appContext, MainActivity::class.java).apply { + flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK } + appContext.startActivity(intent) } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/di/UtilsModule.kt b/app/src/main/java/com/tangem/tap/di/UtilsModule.kt index fd11c7ef1a..d5565743e9 100644 --- a/app/src/main/java/com/tangem/tap/di/UtilsModule.kt +++ b/app/src/main/java/com/tangem/tap/di/UtilsModule.kt @@ -1,5 +1,6 @@ package com.tangem.tap.di +import android.content.Context import com.tangem.core.navigation.feedback.FeedbackManager import com.tangem.core.navigation.finisher.AppFinisher import com.tangem.core.navigation.share.ShareManager @@ -11,6 +12,7 @@ import com.tangem.tap.common.url.CustomTabsUrlOpener import dagger.Module import dagger.Provides import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import javax.inject.Singleton @@ -32,5 +34,5 @@ internal object UtilsModule { @Provides @Singleton - fun provideAppFinisher(): AppFinisher = AndroidAppFinisher() + fun provideAppFinisher(@ApplicationContext context: Context): AppFinisher = AndroidAppFinisher(context) } \ No newline at end of file diff --git a/features/tester/api/src/main/java/com/tangem/features/tester/api/AppRestarter.kt b/features/tester/api/src/main/java/com/tangem/features/tester/api/AppRestarter.kt deleted file mode 100644 index a64be25542..0000000000 --- a/features/tester/api/src/main/java/com/tangem/features/tester/api/AppRestarter.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.tangem.features.tester.api - -/** - * Interface for app restarter - */ -interface AppRestarter { - - fun restart() -} \ No newline at end of file