SDKS-3990 Address missing error and warning exception logging. This change ensures these critical events are properly recorded. (#476)

Author: witrisna

forgerock-auth/src/main/java/org/forgerock/android/auth/CookieMarshaller.java

@@ -40,7 +40,7 @@ String marshal(@NonNull Cookie cookie) {
             outputStream.writeObject(new SerializableCookie(cookie));
             return Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
         } catch (Exception e) {
-            Logger.warn(TAG, "Failed to marshal the cookie to String.", e);
+            Logger.warn(TAG, e, "Failed to marshal the cookie to String.");
             return null;
         }
     }
@@ -66,7 +66,7 @@ protected Class<?> resolveClass(ObjectStreamClass desc) throws ClassNotFoundExce
             };
             return ((SerializableCookie) objectInputStream.readObject()).getCookie();
         } catch (Exception e) {
-            Logger.warn(TAG, "Failed to unmarshal the cookie from String.", e);
+            Logger.warn(TAG, e, "Failed to unmarshal the cookie from String.");
             return null;
         }
     }

forgerock-auth/src/main/java/org/forgerock/android/auth/FRAuth.java

@@ -56,7 +56,7 @@ public static synchronized void start(Context context, @Nullable FROptions optio
                     SessionManager sessionManager = ConfigHelper.getPersistedConfig(context, cachedOptions).getSessionManager();
                     sessionManager.close();
                 } catch (Exception e) {
-                    Logger.warn(TAG, "Failed to close the session manager", e);
+                    Logger.warn(TAG, e, "Failed to close the session manager");
                 }
             }
             Config.getInstance().init(context, currentOptions);

forgerock-auth/src/main/java/org/forgerock/android/auth/devicebind/BiometricOnly.kt

@@ -44,7 +44,7 @@ open class BiometricOnly : BiometricAuthenticator() {
         } catch (e: Exception) {
             //Failed because the key was generated with
             //KeyGenParameterSpec.Builder.setUserAuthenticationParameters
-            Logger.warn(TAG, "Fallback to time-based key", e)
+            Logger.warn(TAG, e, "Fallback to time-based key")
             biometricInterface.authenticate(authenticationCallback)
         }
     }

forgerock-auth/src/main/java/org/forgerock/android/auth/storage/CookiesStorage.kt

@@ -47,7 +47,7 @@ class CookiesStorage(
                 }
             }
         } catch (e: Throwable) {
-            Logger.error(TAG, "Failed to migrate cookies", e)
+            Logger.error(TAG, e, "Failed to migrate cookies")
             original.clearCookies()
         }
     }

forgerock-auth/src/main/java/org/forgerock/android/auth/storage/SSOTokenStorage.kt

@@ -47,7 +47,7 @@ class SSOTokenStorage(
                 original.clearToken()
             }
         } catch (e: Throwable) {
-            Logger.error(TAG, "Failed to migrate SSO token", e)
+            Logger.error(TAG, e, "Failed to migrate SSO token")
             original.clearToken()
         }
     }

forgerock-core/src/main/java/org/forgerock/android/auth/SecuredSharedPreferences.java

@@ -213,7 +213,7 @@ private String decrypt(@NonNull String data) {
             return new String(encryptor.decrypt(Base64.decode(data, Base64.DEFAULT)));
         } catch (Exception e) {
             //Failed to decrypt the data, reset the encryptor
-            Logger.warn(TAG, "Failed to decrypt the data.", e);
+            Logger.warn(TAG, e, "Failed to decrypt the data.");
             if (e instanceof CancellationException) {
                 throw e;
             }

forgerock-core/src/main/java/org/forgerock/android/auth/encrypt/SecretKeyEncryptor.kt

@@ -96,7 +96,7 @@ class SecretKeyEncryptor(block: SecretKeyEncryptorConfig.() -> Unit = {}) : Susp
     override suspend fun encrypt(data: ByteArray): ByteArray = withContext(Dispatchers.Default) {
         lock.withLock {
             withRetry(byteArrayOf(), {
-                Logger.error(TAG, "Failed to encrypt data, retrying...", it)
+                Logger.error(TAG, it, "Failed to encrypt data, retrying...")
                 keyStore.deleteEntry(config.keyAlias)
             }) {
                 Logger.debug(TAG, "Encrypting data...")
@@ -142,7 +142,7 @@ class SecretKeyEncryptor(block: SecretKeyEncryptorConfig.() -> Unit = {}) : Susp
                     )
                 )
             } catch (e: Throwable) {
-                Logger.error(TAG, "Failed to decrypt data", e)
+                Logger.error(TAG, e, "Failed to decrypt data")
                 if (config.throwWhenEncryptError) throw e
                 byteArrayOf()
             }
@@ -180,7 +180,7 @@ class SecretKeyEncryptor(block: SecretKeyEncryptorConfig.() -> Unit = {}) : Susp
             try {
                 SymmetricKey(generateAndroidKeyStoreSecretKey())
             } catch (e: Throwable) {
-                Logger.warn(TAG, "falling back to asymmetric key", e)
+                Logger.warn(TAG, e, "falling back to asymmetric key")
                 //If failed to generate Android keystore secret key, generate file-based secret key
                 generateEmbeddedSecretKey()
             }
@@ -295,7 +295,7 @@ class SecretKeyEncryptor(block: SecretKeyEncryptorConfig.() -> Unit = {}) : Susp
                 keyPairGenerator.generateKeyPair()
             } catch (e: Exception) {
                 //Retry again without strong box enabled, some platform may not response with StrongBoxUnavailableException
-                Logger.warn(TAG, "Strong Box unavailable, recover without strong box", e)
+                Logger.warn(TAG, e, "Strong Box unavailable, recover without strong box")
                 keyGenParameterSpec.setIsStrongBoxBacked(false)
                 keyPairGenerator.initialize(keyGenParameterSpec.build())
                 keyPairGenerator.generateKeyPair()
@@ -386,7 +386,7 @@ class SecretKeyEncryptor(block: SecretKeyEncryptorConfig.() -> Unit = {}) : Susp
                 return keyGenerator.generateKey()
             } catch (e: Exception) {
                 //Retry again without strong box enabled, some platform may not response with StrongBoxUnavailableException
-                Logger.warn(TAG, "Strong Box unavailable, recover without strong box", e)
+                Logger.warn(TAG, e, "Strong Box unavailable, recover without strong box")
                 specBuilder.setIsStrongBoxBacked(false)
                 keyGenerator.init(specBuilder.build())
                 return keyGenerator.generateKey()