Merge pull request #1160 from edx/farhan/LEARNER-6596

Fix redirection issue exists in course discovery web view.

OpenEdXMobile/res/layout/activity_find_course_info.xml

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <RelativeLayout
             android:id="@+id/content_error_root"

OpenEdXMobile/src/main/java/org/edx/mobile/base/BaseWebViewFindCoursesActivity.java

@@ -128,13 +128,19 @@ public void showLoadingProgress() {
         if (progressWheel != null) {
             progressWheel.setVisibility(View.VISIBLE);
         }
+        if (webView != null) {
+            webView.setVisibility(View.GONE);
+        }
     }
 
     @Override
     public void hideLoadingProgress() {
         if (progressWheel != null) {
             progressWheel.setVisibility(View.GONE);
         }
+        if (webView != null) {
+            webView.setVisibility(View.VISIBLE);
+        }
     }
 
     @Override

OpenEdXMobile/src/main/java/org/edx/mobile/view/custom/URLInterceptorWebViewClient.java

@@ -47,13 +47,7 @@ public class URLInterceptorWebViewClient extends WebViewClient {
     /**
      * Tells if the page loading has been finished or not.
      */
-    private boolean loadingFinished = true;
-    /**
-     * Url will be considered as redirected if it will not be the initial page url requested to load.
-     * For example, in case the server redirects us to another URL or the user clicks a link
-     * on the web-page, it will be considered as a redirect.
-     */
-    private boolean redirect = false;
+    private boolean loadingFinished = false;
     /**
      * Tells if the currently loading url is the initial page url requested to load.
      */
@@ -102,13 +96,8 @@ private void setupWebView(WebView webView) {
         //We need to hide the loading progress if the Page starts rendering.
         webView.setWebChromeClient(new WebChromeClient() {
             public void onProgressChanged(WebView view, int progress) {
-                if (progress > 25) {
-                    /*
-                     * 'loadingInitialUrl is marked to false on 25% progress of initial page load
-                     * to avoid any problematic scenarios e.g. user presses some link available on
-                     * a web page before 'onPageFinished' has been called.
-                     */
-                    loadingInitialUrl = false;
+                if (progress < 100) {
+                    loadingFinished = false;
                 }
                 if (pageStatusListener != null) {
                     pageStatusListener.onPageLoadProgressChanged(view, progress);
@@ -136,13 +125,8 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) {
     @Override
     public void onPageFinished(WebView view, String url) {
         super.onPageFinished(view, url);
-
         loadingInitialUrl = false;
-        if (!redirect) {
-            loadingFinished = true;
-        }
-        redirect = false;
-
+        loadingFinished = true;
         // Page loading has finished.
         if (pageStatusListener != null) {
             pageStatusListener.onPageFinished();
@@ -167,14 +151,8 @@ public void onReceivedHttpError(WebView view, WebResourceRequest request, WebRes
         }
     }
 
-
     @Override
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
-        if (!loadingFinished) {
-            redirect = true;
-        }
-        loadingFinished = false;
-
         if (actionListener == null) {
             logger.warn("you have not set IActionLister to this WebViewClient, " +
                     "you might miss some event");
@@ -183,11 +161,10 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         if (parseRecognizedLinkAndCallListener(url)) {
             // we handled this URL
             return true;
-        } else if (redirect && loadingInitialUrl) {
+        } else if (loadingInitialUrl && !loadingFinished) {
             // Server has redirected the initial url to other hosting url, in this case no need to
             // redirect the user to external browser.
-            // Inspiration of this solution has been taken from: https://stackoverflow.com/questions/3149216/how-to-listen-for-a-webview-finishing-loading-a-url/5172952#5172952
-            loadingInitialUrl = false;
+            // For more details see LEARNER-6596
             // Return false means the current WebView handles the url.
             return false;
         } else if (isAllLinksExternal || isExternalLink(url)) {