feat(PermissionsOnboarding): Fix sync discovery and permissions being…

… displayed over onboarding when recreating activity

app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt

@@ -67,6 +67,7 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var showSyncDiscoveryBottomSheet by sharedValue("showSyncDiscoveryBottomSheetKey", true)
     var appReviewLaunches by sharedValue("appReviewLaunchesKey", DEFAULT_APP_REVIEW_LAUNCHES)
     var showAppReviewDialog by sharedValue("showAppReviewDialogKey", true)
+    var showPermissionsOnboarding by sharedValue("showPermissionsOnboardingKey", true)
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 

app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt

@@ -68,6 +68,7 @@ import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
 import com.infomaniak.mail.ui.alertDialogs.TitleAlertDialog
 import com.infomaniak.mail.ui.main.folder.TwoPaneFragment
 import com.infomaniak.mail.ui.main.menu.MenuDrawerFragment
+import com.infomaniak.mail.ui.main.onboarding.PermissionsOnboardingPagerFragment
 import com.infomaniak.mail.ui.newMessage.NewMessageActivity
 import com.infomaniak.mail.ui.sync.SyncAutoConfigActivity
 import com.infomaniak.mail.utils.*
@@ -364,8 +365,11 @@ class MainActivity : BaseActivity() {
         }
 
         fun popBack() {
-            val fragment = currentFragment
-            if (fragment is TwoPaneFragment) fragment.handleOnBackPressed() else navController.popBackStack()
+            when (val fragment = currentFragment) {
+                is TwoPaneFragment -> fragment.handleOnBackPressed()
+                is PermissionsOnboardingPagerFragment -> fragment.leaveOnboarding()
+                else -> navController.popBackStack()
+            }
         }
 
         onBackPressedDispatcher.addCallback(this@MainActivity) {
@@ -481,8 +485,10 @@ class MainActivity : BaseActivity() {
 
     private fun managePermissionsRequesting() {
         if (!hasPermissions(PermissionUtils.getMainPermissions(mustRequireNotification = true))) {
-            if (localSettings.appLaunches == 0) {
-                navController.navigate(R.id.permissionsOnboardingPagerFragment)
+            if (localSettings.showPermissionsOnboarding) {
+                if (currentFragment !is PermissionsOnboardingPagerFragment) {
+                    navController.navigate(R.id.permissionsOnboardingPagerFragment)
+                }
             } else {
                 permissionUtils.requestMainPermissionsIfNeeded()
             }
@@ -514,7 +520,7 @@ class MainActivity : BaseActivity() {
     }
 
     private fun showSyncDiscovery() = with(localSettings) {
-        if (showSyncDiscoveryBottomSheet && appLaunches > 1 && !isUserAlreadySynchronized()) {
+        if (!showPermissionsOnboarding && showSyncDiscoveryBottomSheet && appLaunches > 1 && !isUserAlreadySynchronized()) {
             showSyncDiscoveryBottomSheet = false
             navController.navigate(R.id.syncDiscoveryBottomSheetDialog)
         }

app/src/main/java/com/infomaniak/mail/ui/main/onboarding/PermissionsOnboardingPagerFragment.kt

@@ -40,8 +40,8 @@ import javax.inject.Inject
 class PermissionsOnboardingPagerFragment : Fragment() {
 
     private var binding: FragmentPermissionsOnboardingPagerBinding by safeBinding()
-    private val permissionsOnboardingViewModel: PermissionsOnboardingViewModel by activityViewModels()
     private val mainViewModel: MainViewModel by activityViewModels()
+    private var currentPosition = 0
 
     @Inject
     lateinit var localSettings: LocalSettings
@@ -64,17 +64,21 @@ class PermissionsOnboardingPagerFragment : Fragment() {
         permissionsViewpager.apply {
             adapter = PermissionsPagerAdapter(childFragmentManager, viewLifecycleOwner.lifecycle)
             isUserInputEnabled = false
-            setCurrentItem(permissionsOnboardingViewModel.currentPermissionPosition, false)
+            savedInstanceState?.getInt(VIEW_PAGER_POSITION_KEY)?.let { setCurrentItem(it, false) }
             removeOverScrollForApiBelow31()
         }
 
         continueButton.setOnClickListener {
-            permissionsOnboardingViewModel.currentPermissionPosition = permissionsViewpager.currentItem
             when (permissionsViewpager.currentItem) {
                 0 -> {
                     permissionUtils.requestReadContactsPermission { hasPermission ->
                         if (hasPermission) mainViewModel.updateUserInfo()
-                        if (permissionsViewpager.isLastPage()) leaveOnboarding() else permissionsViewpager.currentItem += 1
+                        if (permissionsViewpager.isLastPage()) {
+                            leaveOnboarding()
+                        } else {
+                            currentPosition += 1
+                            permissionsViewpager.currentItem += 1
+                        }
                     }
                 }
                 1 -> permissionUtils.requestNotificationsPermissionIfNeeded { leaveOnboarding() }
@@ -84,9 +88,19 @@ class PermissionsOnboardingPagerFragment : Fragment() {
         requireActivity().window.statusBarColor = localSettings.accentColor.getOnboardingSecondaryBackground(context)
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putInt(VIEW_PAGER_POSITION_KEY, currentPosition)
+        super.onSaveInstanceState(outState)
+    }
+
     private fun ViewPager2.isLastPage() = adapter?.let { currentItem == it.itemCount - 1 } ?: true
 
-    private fun leaveOnboarding() {
+    fun leaveOnboarding() {
+        localSettings.showPermissionsOnboarding = false
         safeNavigate(R.id.threadListFragment)
     }
+
+    companion object {
+        private const val VIEW_PAGER_POSITION_KEY = "viewPagerPositionKey"
+    }
 }