MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-01 09:16:24 +02:00
Code Releases Wiki Activity

Pass the integer keys to pebble, even if they are not within the known app keys. Requested in #251

Browse Source
This commit is contained in:
Daniele Gobbetti 2016-05-31 12:24:28 +02:00
parent 0231e83ea3
commit 42acb8915a
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
View File

@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Iterator; import java.util.Iterator;
import java.util.Scanner;
import java.util.UUID; import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@ -138,19 +139,36 @@ public class ExternalPebbleJSActivity extends GBActivity {
try { try {
JSONObject in = new JSONObject(msg); JSONObject in = new JSONObject(msg);
JSONObject out = new JSONObject(); JSONObject out = new JSONObject();
String cur_key; String inKey, outKey;
boolean passKey = false;
for (Iterator<String> key = in.keys(); key.hasNext(); ) { for (Iterator<String> key = in.keys(); key.hasNext(); ) {
cur_key = key.next(); passKey = false;
int pebbleAppIndex = knownKeys.optInt(cur_key); inKey = key.next();
outKey = null;
int pebbleAppIndex = knownKeys.optInt(inKey);
if (pebbleAppIndex != 0) { if (pebbleAppIndex != 0) {
Object obj = in.get(cur_key); passKey = true;
outKey = String.valueOf(pebbleAppIndex);
} else {
//do not discard integer keys (see https://developer.pebble.com/guides/communication/using-pebblekit-js/ )
Scanner scanner = new Scanner(inKey);
if (scanner.hasNextInt() && inKey.equals("" + scanner.nextInt())) {
passKey = true;
outKey = inKey;
}
}
if (passKey && outKey != null) {
Object obj = in.get(inKey);
if (obj instanceof Boolean) { if (obj instanceof Boolean) {
obj = ((Boolean) obj) ? "true" : "false"; obj = ((Boolean) obj) ? "true" : "false";
} }
out.put(String.valueOf(pebbleAppIndex), obj); out.put(outKey, obj);
} else { } else {
GB.toast("Discarded key " + cur_key + ", not found in the local configuration.", Toast.LENGTH_SHORT, GB.WARN); GB.toast("Discarded key " + inKey + ", not found in the local configuration and is not an integer key.", Toast.LENGTH_SHORT, GB.WARN);
} }
} }
LOG.info(out.toString()); LOG.info(out.toString());
GBApplication.deviceService().onAppConfiguration(appUuid, out.toString()); GBApplication.deviceService().onAppConfiguration(appUuid, out.toString());