From b8a137226f0f3a827b664e3c5183cb39c6555447 Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele+github@gobbetti.name>
Date: Sun, 3 Sep 2017 17:10:04 +0200
Subject: [PATCH] Webview: Fix sending configuration from watchfaces when
 background message exchange is going on

---
 app/src/main/assets/app_config/configure.html               | 2 +-
 .../main/assets/app_config/js/gadgetbridge_boilerplate.js   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/assets/app_config/configure.html b/app/src/main/assets/app_config/configure.html
index cdc7669f5..a27544b80 100644
--- a/app/src/main/assets/app_config/configure.html
+++ b/app/src/main/assets/app_config/configure.html
@@ -89,7 +89,7 @@
 <div id="step2" class="step">
     <h2>Incoming configuration data:</h2>
     <div id="jsondata"></div>
-    <button class="btn" name="send config" value="send config" onclick="Pebble.actuallySendData()">
+    <button class="btn" name="send config" value="send config" onclick="Pebble.sendConfiguration()">
         Send data to pebble
     </button>
     <h2 class="store_presets">App Presets:</h2>
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 13c7b47a2..f29e8164b 100644
--- a/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js
+++ b/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js
@@ -138,8 +138,8 @@ function gbPebble() {
         window.open(self.configurationURL.toString(), "config");
     }
 
-    this.actuallySendData = function() {
-        GBjs.sendAppMessage(self.configurationValues, false );
+    this.sendConfiguration = function() {
+        GBjs.sendAppMessage(document.getElementById("jsondata").innerHTML, false );
         showStep("step1");
         GBActivity.closeActivity();
     }
@@ -189,7 +189,7 @@ function gbPebble() {
     this.sendAppMessage = function (dict, callbackAck, callbackNack){
         try {
             self.configurationValues = JSON.stringify(dict);
-            if (document.getElementById("step2").style.display == 'block') { //intercept the values
+            if (document.getElementById("step2").style.display == 'block' && document.getElementById("jsondata").innerHTML == "") { //intercept the values
                 document.getElementById("jsondata").innerHTML=self.configurationValues;
             } else { //pass them silently
                 var needsTransaction = false;