Add null check for currentActivityName

* currentActivityName under WebViewManager for IAMs, might end being null
* Add log to know in which case might this field end null

Author: Jeasmine

OneSignalSDK/onesignal/src/main/java/com/onesignal/InAppMessageView.java

@@ -600,4 +600,20 @@ private ValueAnimator animateBackgroundColor(View backgroundView, int duration,
                 endColor,
                 animCallback);
     }
+
+    @Override
+    public String toString() {
+        return "InAppMessageView{" +
+                "currentActivity=" + currentActivity +
+                ", pageWidth=" + pageWidth +
+                ", pageHeight=" + pageHeight +
+                ", dismissDuration=" + dismissDuration +
+                ", hasBackground=" + hasBackground +
+                ", shouldDismissWhenActive=" + shouldDismissWhenActive +
+                ", isDragging=" + isDragging +
+                ", disableDragDismiss=" + disableDragDismiss +
+                ", displayLocation=" + displayLocation +
+                ", webView=" + webView +
+                '}';
+    }
 }

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageController.java

@@ -660,7 +660,7 @@ private void queueMessageForDisplay(@NonNull OSInAppMessage message) {
             // Make sure no message is ever added to the queue more than once
             if (!messageDisplayQueue.contains(message)) {
                 messageDisplayQueue.add(message);
-                logger.debug("In app message with id, " + message.messageId + ", added to the queue");
+                logger.debug("In app message with id: " + message.messageId + ", added to the queue");
             }
 
             attemptToShowInAppMessage();
@@ -683,7 +683,7 @@ private void attemptToShowInAppMessage() {
                 return;
             }
 
-            logger.debug("In app message is currently showing or there are no IAMs left in the queue!");
+            logger.debug("In app message is currently showing or there are no IAMs left in the queue! isInAppMessageShowing: " + isInAppMessageShowing());
         }
     }
 
@@ -726,7 +726,7 @@ void messageWasDismissed(@NonNull OSInAppMessage message, boolean failed) {
     }
 
     void messageWasDismissedByBackPress(@NonNull OSInAppMessage message) {
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "OSInAppMessageController messageWasDismissed by back press: " + message.toString());
+        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "In app message OSInAppMessageController messageWasDismissed by back press: " + message.toString());
         // IAM was not dismissed by user, will be redisplay again until user dismiss it
         dismissCurrentMessage(message);
     }
@@ -753,7 +753,7 @@ private void dismissCurrentMessage(@Nullable OSInAppMessage message) {
                     return;
                 } else {
                     String removedMessageId = messageDisplayQueue.remove(0).messageId;
-                    logger.debug("In app message with id, " + removedMessageId + ", dismissed (removed) from the queue!");
+                    logger.debug("In app message with id: " + removedMessageId + ", dismissed (removed) from the queue!");
                 }
             }
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/WebViewManager.java

@@ -6,14 +6,15 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.Base64;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 import android.webkit.WebView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -63,7 +64,7 @@ boolean isBanner() {
     @NonNull private Activity activity;
     @NonNull private OSInAppMessage message;
 
-    private String currentActivityName = null;
+    @Nullable private String currentActivityName = null;
     private Integer lastPageHeight = null;
 
     interface OneSignalGenericCallback {
@@ -303,21 +304,28 @@ void available(final @NonNull Activity activity) {
         this.activity = activity;
         this.currentActivityName = activity.getLocalClassName();
 
+        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "In app message activity available " +
+                "currentActivityName: " + currentActivityName + " lastActivityName: " + lastActivityName );
+
         if (lastActivityName == null)
             showMessageView(null);
         else if (!lastActivityName.equals(currentActivityName)) {
             // Navigate to new activity while displaying current IAM
             if (messageView != null)
                 messageView.removeAllViews();
             showMessageView(lastPageHeight);
-        } else
+        } else {
+            // Activity rotated
             calculateHeightAndShowWebViewAfterNewActivity();
+        }
     }
 
     @Override
-    void stopped(Activity activity) {
-        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "In app message activity stopped, cleaning views");
-        if (messageView != null && currentActivityName.equals(activity.getLocalClassName()))
+    void stopped(@NonNull Activity activity) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "In app message activity stopped, cleaning views, " +
+                "currentActivityName: " + currentActivityName + "\nactivity: " + this.activity + "\nmessageView: " + messageView);
+
+        if (messageView != null && activity.getLocalClassName().equals(currentActivityName))
             messageView.removeAllViews();
     }