Merge pull request #2743 from brandonpage/fix_back_button

Make shouldShowBackButton value open.

Author: brandonpage

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt

@@ -603,26 +603,33 @@ open class LoginActivity : FragmentActivity() {
         }
     }
 
-    private fun handleBackBehavior() {
-        // If app is using Native Login this activity is a fallback and can be dismissed.
-        if (SalesforceSDKManager.getInstance().nativeLoginActivity != null) {
-            setResult(RESULT_CANCELED)
-            finish()
-            return // If we don't call return here moveTaskToBack can also be called below.
-        }
+    internal fun handleBackBehavior() {
+        with(SalesforceSDKManager.getInstance()) {
+            // If app is using Native Login this activity is a fallback and can be dismissed.
+            if (nativeLoginActivity != null) {
+                setResult(RESULT_CANCELED)
+                finish()
+                return // If we don't call return here moveTaskToBack can also be called below.
+            }
 
-        // Do nothing if locked
-        if (SalesforceSDKManager.getInstance().biometricAuthenticationManager?.locked == false) {
-            /*
-             * If there are no accounts signed in, the login screen needs to go
-             * away and go back to the home screen. However, if the login screen
-             * has been brought up from the switcher screen, the back button
-             * should take the user back to the previous screen.
-             */
-            wasBackgrounded = true
-            when (SalesforceSDKManager.getInstance().userAccountManager.authenticatedUsers) {
-                null -> moveTaskToBack(true)
-                else -> finish()
+            // Do nothing if locked
+            if (biometricAuthenticationManager?.locked == false) {
+                /*
+                 * If there are no accounts signed in, the login screen needs to go
+                 * away and go back to the home screen. However, if the login screen
+                 * has been brought up from the switcher screen, the back button
+                 * should take the user back to the previous screen.
+                 *
+                 * shouldShowBackButton normally checks for authenticated users,
+                 * but trust the app if it has been overridden.
+                 */
+                wasBackgrounded = true
+                if (userAccountManager.authenticatedUsers != null || viewModel.shouldShowBackButton) {
+                    setResult(RESULT_CANCELED)
+                    finish()
+                } else {
+                    moveTaskToBack(true)
+                }
             }
         }
     }

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginViewModel.kt

@@ -181,7 +181,7 @@ open class LoginViewModel(val bootConfig: BootConfig) : ViewModel() {
     open val singleServerCustomTabActivity = false
 
     /** Value representing if the back button should be shown on the login view. */
-    val shouldShowBackButton = with(SalesforceSDKManager.getInstance()) {
+    open val shouldShowBackButton = with(SalesforceSDKManager.getInstance()) {
         !(userAccountManager.authenticatedUsers.isNullOrEmpty() || biometricAuthenticationManager?.locked ?: false)
     }
 

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/LoginView.kt

@@ -151,7 +151,7 @@ fun LoginView() {
             clearCookies = { viewModel.clearCookies() },
             reloadWebView = { viewModel.reloadWebView() },
             shouldShowBackButton = viewModel.shouldShowBackButton,
-            finish = { activity.finish() },
+            finish = { activity.handleBackBehavior() },
         )
     }