Merge pull request #492 from Countly/fix_anr_back

mixed: anr on back in content activity and show content on load

Author: turtledreams

CHANGELOG.md

@@ -1,12 +1,13 @@
 ## XX.XX.XX
 
+* Mitigated an ANR that occurred when the back button was pressed on the content activity.
+
 * Health check requests now include additional metrics.
 
 * Mitigated an issue where behavior settings were not stored when only provided through configuration during initialization.
 * Mitigated an issue where, on the first run of the SDK, behavior settings returned null if none were previously stored.
 * Mitigated an issue where first behavior settings update calls sent twice.
 
-
 ## 25.4.2
 * Mitigated an issue where latest fetched behavior settings were replacing the current settings instead of merging.
 

sdk/src/main/java/ly/count/android/sdk/CountlyWebViewClient.java

@@ -10,10 +10,13 @@
 
 class CountlyWebViewClient extends WebViewClient {
     private final List<WebViewUrlListener> listeners;
+    WebViewPageLoadedListener afterPageFinished;
+    long pageLoadTime;
 
     public CountlyWebViewClient() {
         super();
         this.listeners = new ArrayList<>();
+        this.pageLoadTime = System.currentTimeMillis();
     }
 
     @Override
@@ -38,6 +41,20 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
         return false;
     }
 
+    @Override
+    public void onPageFinished(WebView view, String url) {
+        Log.v(Countly.TAG, "[CountlyWebViewClient] onPageFinished, url: [" + url + "]");
+        super.onPageFinished(view, url);
+        if (afterPageFinished != null) {
+            pageLoadTime = System.currentTimeMillis() - pageLoadTime;
+            boolean timeOut = (pageLoadTime / 1000L) >= 60;
+            Log.d(Countly.TAG, "[CountlyWebViewClient] onPageFinished, pageLoadTime: " + pageLoadTime + " ms");
+
+            afterPageFinished.onPageLoaded(timeOut);
+            afterPageFinished = null;
+        }
+    }
+
     public void registerWebViewUrlListener(WebViewUrlListener listener) {
         this.listeners.add(listener);
     }

sdk/src/main/java/ly/count/android/sdk/TransparentActivity.java

@@ -19,6 +19,7 @@
 import android.webkit.WebView;
 import android.widget.RelativeLayout;
 import androidx.annotation.Nullable;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -46,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // there is a stripe at the top of the screen for contents
         // we eliminate it with hiding the system ui
-        hideSystemUI();
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         super.onCreate(savedInstanceState);
         overridePendingTransition(0, 0);
 
@@ -76,7 +77,8 @@ protected void onCreate(Bundle savedInstanceState) {
         params.y = config.y;
         params.height = config.height;
         params.width = config.width;
-        params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+        params.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+            | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
         getWindow().setAttributes(params);
         getWindow().setBackgroundDrawableResource(android.R.color.transparent);
 
@@ -91,18 +93,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(relativeLayout);
     }
 
-    private void hideSystemUI() {
-        // Enables regular immersive mode
-        getWindow().getDecorView().setSystemUiVisibility(
-            View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_FULLSCREEN
-        );
-    }
-
     private TransparentActivityConfig setupConfig(@Nullable TransparentActivityConfig config) {
         final WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
         final Display display = wm.getDefaultDisplay();
@@ -392,6 +382,7 @@ private void close(Map<String, Object> contentData) {
     @SuppressLint("SetJavaScriptEnabled")
     private WebView createWebView(TransparentActivityConfig config) {
         WebView webView = new CountlyWebView(this);
+        webView.setVisibility(View.INVISIBLE);
         RelativeLayout.LayoutParams webLayoutParams = new RelativeLayout.LayoutParams(config.width, config.height);
         webLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
         webLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_END);
@@ -423,7 +414,17 @@ private WebView createWebView(TransparentActivityConfig config) {
                 return false;
             }
         });
+        client.afterPageFinished = (closeIt) -> {
+            if (closeIt) {
+                close(new HashMap<>());
 
+                if (Countly.sharedInstance().isInitialized()) {
+                    Countly.sharedInstance().moduleContent.notifyAfterContentIsClosed();
+                }
+            } else {
+                webView.setVisibility(View.VISIBLE);
+            }
+        };
         webView.setWebViewClient(client);
         webView.loadUrl(config.url);
         return webView;

sdk/src/main/java/ly/count/android/sdk/WebViewPageLoadedListener.java

@@ -0,0 +1,6 @@
+package ly.count.android.sdk;
+
+public interface WebViewPageLoadedListener {
+
+    void onPageLoaded(boolean timedOut);
+}