Merge pull request #5 from ngonsoto/master

Agrega EULA desde URL
jokoframework · Apr 7, 2018 · 75265ef · 75265ef
2 parents 129a7ff + 7849d93
commit 75265ef
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 deletions.
diff --git a/app/src/main/java/io/github/jokoframework/eula/Eula.java b/app/src/main/java/io/github/jokoframework/eula/Eula.java
@@ -1,11 +1,13 @@
 package io.github.jokoframework.eula;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.view.View;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.CheckBox;
 
 import io.github.jokoframework.R;
@@ -30,6 +32,7 @@ private Eula() {
      * @return Whether the user has agreed already.
      */
 
+    @SuppressLint("StringFormatInvalid")
     public static boolean show(final Activity activity) {
         final SharedPreferences preferences = activity.getSharedPreferences(PREFERENCES_EULA,
                 Activity.MODE_PRIVATE);
@@ -39,15 +42,23 @@ public static boolean show(final Activity activity) {
             final View eulaView = View.inflate(activity, R.layout.activity_eula, null);
 
             WebView mWebView = (WebView) eulaView.findViewById(R.id.webviewEula);
-            String eulaBodyText = "<html><body>"
-                    + "<p align=\"justify\">"
-                    + "<font size=\"" +
-                    ImageUtils.getHtmlScaledFontSize(activity) +
-                    "\">"
-                    + activity.getString(R.string.eula_body)
-                    + "</p> "
-                    + "</body></html>";
-            mWebView.loadData(eulaBodyText, "text/html; charset=utf-8", "utf-8");
+
+            mWebView.loadUrl(activity.getString(R.string.eula_URL));
+
+            mWebView.setWebViewClient(new WebViewClient() {
+                @Override
+                public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+                    String eulaBodyText = "<html><body>"
+                            + "<p align=\"justify\">"
+                            + "<font size=\"" +
+                            ImageUtils.getHtmlScaledFontSize(activity) +
+                            "\">"
+                            + activity.getString(R.string.eula_body)
+                            + "</p> "
+                            + "</body></html>";
+                    mWebView.loadData(eulaBodyText, "text/html; charset=utf-8", "utf-8");
+                }
+            });
 
             View acceptButton = eulaView.findViewById(R.id.eula_accept_btn);
             View refusetButton = eulaView.findViewById(R.id.eula_refuse_btn);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="settings_pwd_not_equal">New passwords are not equal</string>
     <string name="settings_pwd_too_short">New password must have at least 8 characters</string>
     <string name="eula_warning_body">Ud. no aceptó aún los términos de uso de la aplicación. Por favor lea hasta el final y marque la casilla de aceptación si está de acuerdo con las condiciones</string>
+    <string name="eula_URL">http://example.com/</string>
     <string name="eula_warning_title"></string>
     <string name="eula_title">Aviso Legal de Responsabilidades</string>
     <string name="eula_checkbox">I Accept the terms and Conditions</string>

diff --git a/build.gradle b/build.gradle
@@ -5,9 +5,10 @@ buildscript {
         jcenter()
         mavenCentral()
         maven { url 'https://maven.google.com' }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.google.gms:google-services:3.0.0'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 08 08:32:47 PYST 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+#Wed Apr 04 20:51:57 PYT 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip