Merge pull request #2729 from brandonpage/bio-enabled-null-ptr

Fix rare race condition crash.

Author: brandonpage

libs/SalesforceSDK/src/com/salesforce/androidsdk/security/AppLockManager.kt

@@ -31,6 +31,7 @@ import android.content.SharedPreferences
 import com.salesforce.androidsdk.accounts.UserAccount
 import com.salesforce.androidsdk.app.SalesforceSDKManager
 import com.salesforce.androidsdk.util.EventsObservable
+import androidx.core.content.edit
 
 typealias Policy = Pair<Boolean, Int>
 
@@ -84,17 +85,17 @@ internal abstract class AppLockManager(
     }
 
     open fun storeMobilePolicy(account: UserAccount, enabled: Boolean, timeout: Int) {
-        getAccountPrefs(account).edit()
-            .putBoolean(enabledKey, enabled)
-            .putInt(timeoutKey, timeout)
-            .apply()
+        getAccountPrefs(account).edit {
+            putBoolean(enabledKey, enabled)
+                .putInt(timeoutKey, timeout)
+        }
     }
 
     open fun cleanUp(account: UserAccount) {
-        val editor = getAccountPrefs(account).edit()
-        getAccountPrefs(account).all.keys.forEach { key ->
-            editor.remove(key)
+        getAccountPrefs(account).edit {
+            getAccountPrefs(account).all.keys.forEach { key ->
+                remove(key)
+            }
         }
-        editor.apply()
     }
 }

libs/SalesforceSDK/src/com/salesforce/androidsdk/security/BiometricAuthenticationManager.kt

@@ -34,6 +34,7 @@ import com.salesforce.androidsdk.app.SalesforceSDKManager
 import com.salesforce.androidsdk.security.interfaces.BiometricAuthenticationManager
 import com.salesforce.androidsdk.ui.BiometricAuthOptInPrompt
 import com.salesforce.androidsdk.util.EventsObservable
+import androidx.core.content.edit
 
 internal class BiometricAuthenticationManager: AppLockManager(
     BIO_AUTH_POLICY, BIO_AUTH_ENABLED, BIO_AUTH_TIMEOUT
@@ -42,7 +43,7 @@ internal class BiometricAuthenticationManager: AppLockManager(
     @Suppress("INAPPLICABLE_JVM_NAME")
     @get:JvmName("isEnabled")
     override val enabled: Boolean
-        get() { return currentUser != null && getPolicy(currentUser!!).first }
+        get() = currentUser?.let { getPolicy(it).first } == true
     private val currentUser: UserAccount?
         get() { return SalesforceSDKManager.getInstance().userAccountManager.currentUser }
 
@@ -74,9 +75,7 @@ internal class BiometricAuthenticationManager: AppLockManager(
 
     override fun biometricOptIn(optIn: Boolean) {
         currentUser?.let { user ->
-            getAccountPrefs(user).edit()
-                .putBoolean(USER_BIO_OPT_IN, optIn)
-                .apply()
+            getAccountPrefs(user).edit { putBoolean(USER_BIO_OPT_IN, optIn) }
         }
     }
 
@@ -94,8 +93,7 @@ internal class BiometricAuthenticationManager: AppLockManager(
 
     override fun enableNativeBiometricLoginButton(enabled: Boolean) {
         currentUser?.let { user ->
-            getAccountPrefs(user)
-                .edit().putBoolean(BIO_AUTH_NATIVE_BUTTON, enabled).apply()
+            getAccountPrefs(user).edit { putBoolean(BIO_AUTH_NATIVE_BUTTON, enabled) }
         }
     }