From ab8caabd1576b7bcc5c29dfc69bf6b2797144058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Wed, 15 May 2019 16:03:18 +0200 Subject: [android] fix FragmentBackStackActivity navigation --- .../testapp/activity/fragment/FragmentBackStackActivity.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt index febe17a701..a642ebe594 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt @@ -45,8 +45,12 @@ class FragmentBackStackActivity : AppCompatActivity() { } override fun onBackPressed() { - // activity uses singleInstance for testing purposes - // code below provides a default navigation when using the app - NavUtils.navigateHome(this) + if (supportFragmentManager.backStackEntryCount == 0) { + // activity uses singleInstance for testing purposes + // code below provides a default navigation when using the app + NavUtils.navigateHome(this) + } else { + super.onBackPressed() + } } } \ No newline at end of file -- cgit v1.2.1