Apply main request check in all web page load error callbacks

- LEARNER-1943
openedx-unsupported · Jul 19, 2017 · 0927ed4 · 0927ed4
1 parent 0cd834f
commit 0927ed4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/base/FindCoursesBaseActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/base/FindCoursesBaseActivity.java
@@ -357,9 +357,12 @@ public void onPageLoadError(WebView view, int errorCode, String description, Str
         }
 
         @Override
-        public void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
-            isWebViewLoaded = false;
-            showOfflineMessage();
+        public void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse,
+                                    boolean isMainRequestFailure) {
+            if (isMainRequestFailure) {
+                isWebViewLoaded = false;
+                showOfflineMessage();
+            }
         }
 
         @Override

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CertificateFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CertificateFragment.java
@@ -109,8 +109,11 @@ public void onPageLoadError(WebView view, int errorCode, String description, Str
             }
 
             @Override
-            public void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
-                loadingIndicator.setVisibility(View.GONE);
+            public void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse,
+                                        boolean isMainRequestFailure) {
+                if (isMainRequestFailure) {
+                    loadingIndicator.setVisibility(View.GONE);
+                }
             }
 
             @Override

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseUnitWebViewFragment.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/CourseUnitWebViewFragment.java
@@ -64,8 +64,9 @@ public void onPageLoadError(WebView view, int errorCode, String description, Str
 
             @Override
             @TargetApi(Build.VERSION_CODES.M)
-            public void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
-                if (request.getUrl().toString().equals(view.getUrl())) {
+            public void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse,
+                                        boolean isMainRequestFailure) {
+                if (isMainRequestFailure) {
                     ViewPagerDownloadManager.instance.done(CourseUnitWebViewFragment.this, false);
                 }
             }

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/custom/URLInterceptorWebViewClient.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/custom/URLInterceptorWebViewClient.java
@@ -129,10 +129,12 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
     }
 
     @Override
+    @TargetApi(Build.VERSION_CODES.M)
     public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
         super.onReceivedHttpError(view, request, errorResponse);
         if (pageStatusListener != null) {
-            pageStatusListener.onPageLoadError(view, request, errorResponse);
+            pageStatusListener.onPageLoadError(view, request, errorResponse,
+                    request.getUrl().toString().equals(view.getUrl()));
         }
     }
 
@@ -295,7 +297,8 @@ public interface IPageStatusListener {
         /**
          * Callback that indicates error during page load.
          */
-        void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse);
+        void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse,
+                             boolean isMainRequestFailure);
 
         /**
          * Callback that indicates that the page is 50 percent loaded.

diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/view/dialog/WebViewActivity.java b/OpenEdXMobile/src/main/java/org/edx/mobile/view/dialog/WebViewActivity.java
@@ -58,8 +58,11 @@ public void onPageLoadError(WebView view, int errorCode, String description, Str
             }
 
             @Override
-            public void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
-                progress.setVisibility(View.GONE);
+            public void onPageLoadError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse,
+                                        boolean isMainRequestFailure) {
+                if (isMainRequestFailure) {
+                    progress.setVisibility(View.GONE);
+                }
             }
 
             @Override