@W-21933885: [MSDK Android] App Attestation Implementation (Resolve To-Dos)

Author: JohnsonEricAtSalesforce

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

@@ -242,7 +242,7 @@ open class SalesforceSDKManager protected constructor(
         set(value) {
             field = value
 
-            val loginHost = loginServerManager.selectedLoginServer.url.toUri().host
+            val loginHost = loginServerManager.selectedLoginServer?.url?.toUri()?.host
             if (loginHost == null) {
                 w(javaClass.name, "Cannot initialize Salesforce App Attestation Client since the selected login server URL doesn't have a host. Authentication may malfunction.")
                 return

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/NativeLoginManager.kt

@@ -190,13 +190,11 @@ internal class NativeLoginManager(
 
     @VisibleForTesting
     internal fun isValidPassword(password: String): Boolean {
-        // TODO: Revert this change after testing with administrator-created accounts that have non-compliant passwords. ECJ20260312
-//        val containsNumber = password.contains("[0-9]".toRegex())
-//        val containsLetter = password.contains("[A-Za-z]".toRegex())
+        val containsNumber = password.contains("[0-9]".toRegex())
+        val containsLetter = password.contains("[A-Za-z]".toRegex())
 
-//        return containsNumber && containsLetter && password.length >= MIN_PASSWORD_LENGTH
-//                && password.toByteArray().size <= MAX_PASSWORD_LENGTH_BYTES
-        return true
+        return containsNumber && containsLetter && password.length >= MIN_PASSWORD_LENGTH
+                && password.toByteArray().size <= MAX_PASSWORD_LENGTH_BYTES
     }
 
     private suspend fun suspendFinishAuthFlow(tokenResponse: RestResponse): NativeLoginResult {
@@ -245,7 +243,6 @@ internal class NativeLoginManager(
     }
 
     private fun createRequestBody(vararg kvPairs: Pair<String, String?>): RequestBody {
-        // TODO: Review this. If the request body is treated immutably, then filtering null values is a convenient way to handle optional values. ECJ20260312
         kvPairs.filter { it.second != null }
         val requestBodyString = kvPairs.joinToString("&") { (key, value) -> "$key=$value" }
         val mediaType = CONTENT_TYPE_VALUE_HTTP_POST.toMediaTypeOrNull()