Merge remote-tracking branch 'origin/master' into SDK-337-in-app-close-button-position

Author: franco-zalamena-iterable

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

@@ -2,7 +2,9 @@
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
@@ -192,9 +194,12 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
             applyWindowGravity(getDialog().getWindow(), "onCreateView");
         }
 
-        webView = new IterableWebView(getContext());
+        webView = createWebViewSafely(getContext());
+        if (webView == null) {
+            dismissAllowingStateLoss();
+            return null;
+        }
         webView.setId(R.id.webView);
-
         webView.createWithHtml(this, htmlString);
 
         if (orientationListener == null) {
@@ -314,7 +319,9 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
      */
     @Override
     public void onStop() {
-        orientationListener.disable();
+        if (orientationListener != null) {
+            orientationListener.disable();
+        }
 
         super.onStop();
     }
@@ -838,6 +845,18 @@ InAppLayout getInAppLayout(Rect padding) {
             return InAppLayout.CENTER;
         }
     }
+
+    private IterableWebView createWebViewSafely(Context context) {
+        try {
+            return new IterableWebView(context);
+        } catch (Resources.NotFoundException e) {
+            IterableLogger.e(TAG, "Failed to create WebView - system WebView resource issue", e);
+            return null;
+        } catch (RuntimeException e) {
+            IterableLogger.e(TAG, "Failed to create WebView - unexpected error", e);
+            return null;
+        }
+    }
 }
 
 enum InAppLayout {