Home Explore Help
Sign In
SX_Cloud
/
space-android
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

if custom_error is empty simply show error page, otherwise show custom error html page

tobiaskaminsky 7 years ago
parent
ed8a51cae2
commit
534449247e
3 changed files with 16 additions and 7 deletions
Split View Show Diff Stats
  1. 8 1
      src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
  2. 8 2
      src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java
  3. 0 4
      src/main/res/raw/custom_error.html

+ 8 - 1
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View File 

@@ -126,6 +126,7 @@ import com.owncloud.android.utils.AnalyticsUtils;
 
 import com.owncloud.android.utils.DisplayUtils;

 import com.owncloud.android.utils.ErrorMessageAdapter;

 

+import java.io.InputStream;

 import java.net.URLDecoder;

 import java.security.cert.X509Certificate;

 import java.util.HashMap;

@@ -412,7 +413,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
             public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {

                 progressBar.setVisibility(View.GONE);

                 mLoginWebView.setVisibility(View.VISIBLE);

-                mLoginWebView.loadData(DisplayUtils.getData(getResources().openRawResource(R.raw.custom_error)),"text/html; charset=UTF-8", null);

+

+                InputStream resources = getResources().openRawResource(R.raw.custom_error);

+                String customError = DisplayUtils.getData(resources);

+

+                if (!customError.isEmpty()) {

+                    mLoginWebView.loadData(customError, "text/html; charset=UTF-8", null);

+                }

             }

         });

+ 8 - 2
src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java
View File 

@@ -37,6 +37,8 @@ import com.owncloud.android.R;
 
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import com.owncloud.android.utils.DisplayUtils;
 
 
+import java.io.InputStream;
 
+
 
 /**
 
  * This activity shows an URL as a web view
 
  */
 
@@ -122,8 +124,12 @@ public class ExternalSiteWebView extends FileActivity {
 
 
         webview.setWebViewClient(new WebViewClient() {
 
             public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
 
-                webview.loadData(DisplayUtils.getData(getResources().openRawResource(R.raw.custom_error)),
 
-                        "text/html; charset=UTF-8", null);
 
+                InputStream resources = getResources().openRawResource(R.raw.custom_error);
 
+                String customError = DisplayUtils.getData(resources);
 
+
 
+                if (!customError.isEmpty()) {
 
+                    webview.loadData(customError, "text/html; charset=UTF-8", null);
 
+                }
 
             }
 
         });

+ 0 - 4
src/main/res/raw/custom_error.html
View File 

@@ -1,4 +0,0 @@
 
-<html>
 
-<h1>Sorry</h1>
 
-Modified
 
-</html>