From 1933e2bf10b169201ffc7438837539afa7d2c900 Mon Sep 17 00:00:00 2001
From: danielegobbetti <daniele+github@gobbetti.name>
Date: Mon, 21 Mar 2016 21:19:32 +0100
Subject: [PATCH] Localize the title of the configuration activity. Auto open
 local settings (e.g. clay)

---
 app/src/main/AndroidManifest.xml                            | 2 +-
 app/src/main/assets/app_config/configure.html               | 2 +-
 .../main/assets/app_config/js/gadgetbridge_boilerplate.js   | 3 +++
 .../gadgetbridge/activities/ExternalPebbleJSActivity.java   | 6 +++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c04cea7e..5d0ac7d1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -261,7 +261,7 @@
 
         <activity
             android:name=".activities.ExternalPebbleJSActivity"
-            android:label="external_js"
+            android:label="@string/app_configure"
             android:parentActivityName=".activities.AppManagerActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/assets/app_config/configure.html b/app/src/main/assets/app_config/configure.html
index dd77ad43..14e4d7fd 100644
--- a/app/src/main/assets/app_config/configure.html
+++ b/app/src/main/assets/app_config/configure.html
@@ -45,7 +45,7 @@
 <div id="step1">
     <h2>Url of the configuration:</h2>
     <div id="config_url"></div>
-    <button class="btn" name="show config" value="show config" onclick="Pebble.showConfiguration()" >Show config / URL</button>
+    <!--<button class="btn" name="show config" value="show config" onclick="Pebble.showConfiguration()" >Show config / URL</button>-->
     <button class="btn" name="open config" value="open config" onclick="Pebble.actuallyOpenURL()" >Open configuration website</button>
 </div>
 <div id="step2">
diff --git a/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js b/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js
index 3e025ccb..df85886d 100644
--- a/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js
+++ b/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js
@@ -111,6 +111,8 @@ function gbPebble() {
         GBjs.gbLog("app wanted to show: " + title + " body: "+ body);
     }
 
+    this.ready = function() {
+    }
 
 }
 
@@ -129,6 +131,7 @@ if (jsConfigFile != null) {
         } else {
             document.getElementById('step2').style.display="none";
             Pebble.ready();
+            Pebble.showConfiguration();
         }
     });
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index caa6a290..2f86bfaf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -96,9 +96,13 @@ public class ExternalPebbleJSActivity extends Activity {
     private class GBChromeClient extends WebChromeClient {
         @Override
         public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
-            GB.toast(consoleMessage.message(), Toast.LENGTH_LONG, GB.ERROR);
+            if (ConsoleMessage.MessageLevel.ERROR.equals(consoleMessage.messageLevel())) {
+                GB.toast(consoleMessage.message(), Toast.LENGTH_LONG, GB.ERROR);
+                //TODO: show error page
+            }
             return super.onConsoleMessage(consoleMessage);
         }
+
     }
 
     private class GBWebClient extends WebViewClient {