[MOB-11508] Some fixes

Author: sumeruchat

iterableapi/src/main/java/com/iterable/iterableapi/IterableAuthManager.java

@@ -256,22 +256,33 @@ void clearRefreshTimer() {
 
     @Override
     public void onSwitchToBackground() {
-        IterableLogger.v(TAG, "App switched to background. Clearing auth refresh timer.");
-        clearRefreshTimer();
+        try {
+            IterableLogger.v(TAG, "App switched to background. Clearing auth refresh timer.");
+            clearRefreshTimer();
+        } catch (Exception e) {
+            IterableLogger.e(TAG, "Error in onSwitchToBackground", e);
+        }
     }
 
     @Override
     public void onSwitchToForeground() {
-        IterableLogger.v(TAG, "App switched to foreground. Re-evaluating auth token refresh.");
-        String authToken = api.getAuthToken();
-        
-        if (authToken != null) {
-            // Try to queue normal expiration refresh - if token is expired, this will handle it appropriately
-            queueExpirationRefresh(authToken);
-        } else if ((api.getEmail() != null || api.getUserId() != null) && !pendingAuth) {
-            // No token but user is set - request new token
-            IterableLogger.d(TAG, "App foregrounded, user identified, no auth token present. Requesting new token.");
-            requestNewAuthToken(false, null, true);
+        try {
+            IterableLogger.v(TAG, "App switched to foreground. Re-evaluating auth token refresh.");
+            String authToken = api.getAuthToken();
+
+            if (authToken != null) {
+                queueExpirationRefresh(authToken);
+                // If queueExpirationRefresh didn't schedule a timer (expired token case), request new token
+                if (!isTimerScheduled && !pendingAuth) {
+                    IterableLogger.d(TAG, "Token expired, requesting new token on foreground");
+                    requestNewAuthToken(false, null, true);
+                }
+            } else if ((api.getEmail() != null || api.getUserId() != null) && !pendingAuth) {
+                IterableLogger.d(TAG, "App foregrounded, user identified, no auth token present. Requesting new token.");
+                requestNewAuthToken(false, null, true);
+            }
+        } catch (Exception e) {
+            IterableLogger.e(TAG, "Error in onSwitchToForeground", e);
         }
     }
 }

iterableapi/src/test/java/com/iterable/iterableapi/IterableActivityMonitorTest.java

@@ -98,21 +98,21 @@ public IterableConfig.Builder run(IterableConfig.Builder builder) {
                 return builder.setAuthHandler(mockAuthHandler);
             }
         }, null);
-        
+
         IterableApi.getInstance().setEmail("[email protected]");
         IterableAuthManager authManager = IterableApi.getInstance().getAuthManager();
-        
+
         // Verify AuthManager is registered as a callback
         ActivityController<Activity> activity = Robolectric.buildActivity(Activity.class).create().start().resume();
         Robolectric.flushForegroundThreadScheduler();
-        
+
         // Verify we can trigger lifecycle methods without errors
         authManager.onSwitchToBackground();
         authManager.onSwitchToForeground();
-        
+
         // Test that reset() unregisters the callback
         authManager.reset();
-        
+
         // After reset, lifecycle methods should still work (no exceptions)
         authManager.onSwitchToBackground();
         authManager.onSwitchToForeground();

iterableapi/src/test/java/com/iterable/iterableapi/IterableApiAuthTests.java

@@ -483,29 +483,29 @@ public void testRegisterForPushInvokedAfterTokenRefresh() throws InterruptedExce
     @Test
     public void testAuthTokenRefreshPausesOnBackground() throws Exception {
         IterableApi.initialize(getContext(), "apiKey");
-        
+
         IterableAuthManager authManager = IterableApi.getInstance().getAuthManager();
-        
+
         // Set up a valid token and user to trigger normal expiration refresh
         doReturn(validJWT).when(authHandler).onAuthTokenRequested();
         IterableApi.getInstance().setEmail("[email protected]");
         shadowOf(getMainLooper()).runToEndOfTasks();
-        
+
         // Request auth token which should set a timer for expiration refresh
         authManager.requestNewAuthToken(false);
         shadowOf(getMainLooper()).runToEndOfTasks();
-        
+
         // The timer might be null if the token is considered expired, so let's test the behavior
-        // rather than the internal timer state. We'll check that onSwitchToBackground and 
+        // rather than the internal timer state. We'll check that onSwitchToBackground and
         // onSwitchToForeground can be called without exceptions
-        
+
         // Simulate app going to background - should clear any timer
         authManager.onSwitchToBackground();
-        
+
         // Simulate app coming to foreground - should re-evaluate token state
         authManager.onSwitchToForeground();
         shadowOf(getMainLooper()).runToEndOfTasks();
-        
+
         // Test passes if no exceptions were thrown and lifecycle methods executed successfully
     }