Merge pull request #1 from smartnsoft/feature/handle_multiple_error_m…

…essages Feature/handle multiple error messages
smartnsoft · Nov 6, 2018 · 3050679 · 3050679
2 parents 56813ea + 70e7a2f
commit 3050679
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 10 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -12,8 +12,8 @@ android
     minSdkVersion 14
     targetSdkVersion 28
 
-    versionCode 4
-    versionName "2.1"
+    versionCode 5
+    versionName "2.2"
   }
 
   buildTypes

diff --git a/library/src/main/java/com/smartnsoft/webviewfragment/WebViewFragment.java b/library/src/main/java/com/smartnsoft/webviewfragment/WebViewFragment.java
@@ -39,6 +39,7 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
+import android.widget.TextView;
 
 import com.smartnsoft.droid4me.LifeCycle.BusinessObjectsRetrievalAsynchronousPolicy;
 import com.smartnsoft.droid4me.support.v4.app.SmartFragment;
@@ -57,6 +58,10 @@ public class WebViewFragment<AggregateClass>
 
   public static final String SCREEN_TITLE_EXTRA = "screenTitleExtra";
 
+  public static final String DEFAULT_ERROR_MESSAGE_EXTRA = "defaultErrorMessageExtra";
+
+  public static final String ERROR_MESSAGES_TABLE_EXTRA = "errorMessagesTableExtra";
+
   //Views
   protected View loadingErrorAndRetry;
 
@@ -66,6 +71,8 @@ public class WebViewFragment<AggregateClass>
 
   protected Button retry;
 
+  protected TextView errorTextView;
+
   //webview state
   protected boolean webViewRestored = false;
 
@@ -89,6 +96,12 @@ public void onReceive(Context context, Intent intent)
 
   protected Map<String, Boolean> networkStatus = new HashMap<>();
 
+  protected Map<Integer, String> errorMessagesTable = null;
+
+  protected String defaultErrorMessage = null;
+
+  protected int errorWhileLoading = -100;
+
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
@@ -121,6 +134,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     loadingErrorAndRetry = rootView.findViewById(R.id.loadingErrorAndRetry);
     errorAndRetry = rootView.findViewById(R.id.errorAndRetry);
     retry = rootView.findViewById(R.id.retry);
+    errorTextView = rootView.findViewById(R.id.errorText);
 
     retry.setOnClickListener(this);
 
@@ -259,6 +273,12 @@ public void onRetrieveBusinessObjects()
       throws BusinessObjectUnavailableException
   {
     url = getActivity().getIntent().getStringExtra(WebViewFragment.PAGE_URL_EXTRA);
+    defaultErrorMessage = getActivity().getIntent().getStringExtra(WebViewFragment.DEFAULT_ERROR_MESSAGE_EXTRA);
+    if (getActivity().getIntent().hasExtra(WebViewFragment.ERROR_MESSAGES_TABLE_EXTRA)
+        && getActivity().getIntent().getSerializableExtra(WebViewFragment.ERROR_MESSAGES_TABLE_EXTRA) instanceof Map)
+    {
+      errorMessagesTable = (Map<Integer, String>) getActivity().getIntent().getSerializableExtra(WebViewFragment.ERROR_MESSAGES_TABLE_EXTRA);
+    }
   }
 
   @Override
@@ -365,8 +385,9 @@ public void onAnimationRepeat(Animation animation)
     }
   }
 
-  protected void showErrorScreen()
+  protected void showErrorScreen(int errorCode)
   {
+    handleErrorCode(errorCode);
     errorAndRetry.setVisibility(View.VISIBLE);
     loadingErrorAndRetry.setVisibility(View.VISIBLE);
   }
@@ -387,7 +408,7 @@ protected void refresh()
     }
     else
     {
-      showErrorScreen();
+      showErrorScreen(WebViewClient.ERROR_CONNECT);
     }
   }
 
@@ -482,7 +503,7 @@ public void onPageFinished(WebView view, String currentURL)
         }
         else
         {
-          showErrorScreen();
+          showErrorScreen(errorWhileLoading);
         }
 
         refreshMenu();
@@ -493,16 +514,17 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
       {
         super.onReceivedError(view, errorCode, description, failingUrl);
         errorWhenLoadingPage = true;
-        showErrorScreen();
+        errorWhileLoading = errorCode;
         refreshMenu();
       }
 
+      @TargetApi(Build.VERSION_CODES.M)
       @Override
-      public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error)
+      public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError webSoWebResourceError)
       {
-        super.onReceivedError(view, request, error);
+        super.onReceivedError(view, request, webSoWebResourceError);
         errorWhenLoadingPage = true;
-        showErrorScreen();
+        errorWhileLoading = webSoWebResourceError.getErrorCode();
         refreshMenu();
       }
     };
@@ -518,7 +540,19 @@ public void onReceivedError(WebView view, WebResourceRequest request, WebResourc
     }
     else
     {
-      showErrorScreen();
+      showErrorScreen(WebViewClient.ERROR_CONNECT);
+    }
+  }
+
+  private void handleErrorCode(int errorCode)
+  {
+    if (errorMessagesTable != null && errorMessagesTable.containsKey(errorCode))
+    {
+      errorTextView.setText(errorMessagesTable.get(errorCode));
+    }
+    else if (defaultErrorMessage != null)
+    {
+      errorTextView.setText(defaultErrorMessage);
     }
   }