android 0.06: Option to keep messages after a disconnect (default false) (fix #1186)

apps.json

@@ -99,18 +99,20 @@
     "id": "android",
     "name": "Android Integration",
     "shortName": "Android",
-    "version": "0.05",
+    "version": "0.06",
     "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
     "icon": "app.png",
     "tags": "tool,system,messages,notifications",
     "dependencies": {"messages":"app"},
     "supports": ["BANGLEJS","BANGLEJS2"],
+    "readme": "README.md",
     "storage": [
       {"name":"android.app.js","url":"app.js"},
       {"name":"android.settings.js","url":"settings.js"},
       {"name":"android.img","url":"app-icon.js","evaluate":true},
       {"name":"android.boot.js","url":"boot.js"}
     ],
+    "data": [{"name":"android.settings.json"}],
     "sortorder": -8
   },
   {

apps/android/ChangeLog

@@ -4,3 +4,4 @@
 0.03: Handling of message actions (ok/clear)
 0.04: Android icon now goes to settings page with 'find phone'
 0.05: Fix handling of message actions
+0.06: Option to keep messages after a disconnect (default false) (fix #1186)

apps/android/README.md

@@ -0,0 +1,48 @@
+# Android Integration
+
+This app allows your Bangle.js to receive notifications [from the Gadgetbridge app on Android](http://www.espruino.com/Gadgetbridge)
+
+See [this link](http://www.espruino.com/Gadgetbridge) for notes on how to install
+the Android app (and how it works).
+
+It requires the `Messages` app on Bangle.js (which should be automatically installed) to
+display any notifications that are received.
+
+## Settings
+
+You can access the settings menu either from the `Android` icon in the launcher,
+or from `App Settings` in the `Settings` menu.
+
+It contains:
+
+* `Connected` - shows whether there is an active Bluetooth connection or not
+* `Find Phone` - opens a submenu where you can activate the `Find Phone` functionality
+of Gadgetbridge - making your phone make noise so you can find it.
+* `Keep Msgs` - default is `Off`. When Gadgetbridge disconnects, should Bangle.js
+keep any messages it has received, or should it delete them?
+* `Messages` - launches the messages app, showing a list of messages
+
+## How it works
+
+Gadgetbridge on Android connects to Bangle.js, and sends commands over the
+BLE UART connection. These take the form of `GB({ ... JSON ... })\n` - so they
+call a global function called `GB` which then interprets the JSON.
+
+Responses are sent back to Gadgetbridge simply as one line of JSON.
+
+More info on message formats on http://www.espruino.com/Gadgetbridge
+
+## Testing
+
+Bangle.js can only hold one connection open at a time, so it's hard to see
+if there are any errors when handling Gadgetbridge messages.
+
+However you can:
+
+* Use the `Gadgetbridge Debug` app on Bangle.js to display/log the messages received from Gadgetbridge
+* Connect with the Web IDE and manually enter the Gadgetbridge messages on the left-hand side to
+execute them as if they came from Gadgetbridge, for instance:
+
+```
+GB({"t":"notify","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"})
+```

apps/android/boot.js

@@ -4,6 +4,7 @@
     Bluetooth.println(JSON.stringify(message));
   }
 
+  var settings = require("Storage").readJSON("android.settings.json",1)||{};
   var _GB = global.GB;
   global.GB = (event) => {
     // feed a copy to other handlers if there were any
@@ -51,6 +52,7 @@
   // Battery monitor
   function sendBattery() { gbSend({ t: "status", bat: E.getBattery() }); }
   NRF.on("connect", () => setTimeout(sendBattery, 2000));
+  if (!settings.keep)
     NRF.on("disconnect", () => require("messages").clearAll()); // remove all messages on disconnect
   setInterval(sendBattery, 10*60*1000);
   // Health tracking
@@ -68,4 +70,6 @@
     if (isFinite(msg.id)) return gbSend({ t: "notify", n:response?"OPEN":"DISMISS", id: msg.id });
     // error/warn here?
   };
+  // remove settings object so it's not taking up RAM
+  delete settings;
 })();

apps/android/settings.js

@@ -2,17 +2,29 @@
   function gb(j) {
     Bluetooth.println(JSON.stringify(j));
   }
+  var settings = require("Storage").readJSON("android.settings.json",1)||{};
+  function updateSettings() {
+    require("Storage").writeJSON("android.settings.json", settings);
+  }
   var mainmenu = {
     "" : { "title" : "Android" },
     "< Back" : back,
-    "Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
+    /*LANG*/"Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
     "Find Phone" : () => E.showMenu({
         "" : { "title" : "Find Phone" },
         "< Back" : ()=>E.showMenu(mainmenu),
-        "On" : _=>gb({t:"findPhone",n:true}),
-        "Off" : _=>gb({t:"findPhone",n:false}),
+        /*LANG*/"On" : _=>gb({t:"findPhone",n:true}),
+        /*LANG*/"Off" : _=>gb({t:"findPhone",n:false}),
       }),
-    "Messages" : ()=>load("messages.app.js")
+    /*LANG*/"Keep Msgs" : {
+      value : !!settings.keep,
+      format : v=>v?/*LANG*/"Yes":/*LANG*/"No",
+      onchange: v => {
+        settings.keep = v;
+        updateSettings();
+      }
+    },
+    /*LANG*/"Messages" : ()=>load("messages.app.js")
   };
   E.showMenu(mainmenu);
 })