From 45cf4e53969c687df40c6489b8e259599bc9800d Mon Sep 17 00:00:00 2001 From: atkyritsis Date: Thu, 27 Oct 2016 18:44:27 +0200 Subject: [PATCH 01/20] Removed duplicate if statement. --- .../gadgetbridge/service/devices/miband/MiBandSupport.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java index 7ae98b72..35cf1e0e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java @@ -815,9 +815,6 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport { } else if (MiBandService.UUID_CHARACTERISTIC_REALTIME_STEPS.equals(characteristicUUID)) { handleRealtimeSteps(characteristic.getValue()); return true; - } else if (MiBandService.UUID_CHARACTERISTIC_REALTIME_STEPS.equals(characteristicUUID)) { - handleRealtimeSteps(characteristic.getValue()); - return true; } else if (MiBandService.UUID_CHARACTERISTIC_HEART_RATE_MEASUREMENT.equals(characteristicUUID)) { handleHeartrate(characteristic.getValue()); return true; From 67937dd6eef8402773d8c0ab0115a1fc63c8e46a Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 27 Oct 2016 11:18:44 +0200 Subject: [PATCH 02/20] Mark 3rd party facebook apps notifications as Facebook - Toffeed: https://f-droid.org/repository/browse/?fdid=me.jakelane.wrapperforfacebook - Slimsocial: https://f-droid.org/repository/browse/?fdid=it.rignanese.leo.slimfacebook - MaterialFBook: https://f-droid.org/repository/browse/?fdid=me.zeeroooo.materialfb Signed-off-by: Julien Pivotto --- .../gadgetbridge/externalevents/NotificationListener.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java index 1fd7dc81..8f925e2b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java @@ -278,6 +278,9 @@ public class NotificationListener extends NotificationListenerService { case "org.telegram.messenger": notificationSpec.type = NotificationType.TELEGRAM; break; + case "me.zeeroooo.materialfb": + case "it.rignanese.leo.slimfacebook": + case "me.jakelane.wrapperforfacebook": case "com.facebook.katana": case "org.indywidualni.fblite": notificationSpec.type = NotificationType.FACEBOOK; From d73b3137cb5bb51cb27f0e7d63fd9380fa5b78c8 Mon Sep 17 00:00:00 2001 From: xzovy Date: Fri, 28 Oct 2016 14:56:56 -0400 Subject: [PATCH 03/20] Fixed typo in README.md Fixed typo on line 40. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee56c594..c54814c6 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ need to create an account and transmit any of your data to the vendor's servers. * Music control: play/pause, next track, previous track, volume up, volume down * List and remove installed apps/watchfaces * Install watchfaces and watchapps (.pbw) -* Install firwmare files (.pbz) [READ THE WIKI](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Pebble-Firmware-updates) +* Install firmware files (.pbz) [READ THE WIKI](https://github.com/Freeyourgadget/Gadgetbridge/wiki/Pebble-Firmware-updates) * Install language files (.pbl) * Take and share screenshots from the Pebble's screen * PebbleKit support for 3rd Party Android Apps (experimental) From afe5f17e5a0f61c7a8b398872abbf30ba9e82c34 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Fri, 28 Oct 2016 21:39:40 +0200 Subject: [PATCH 04/20] bump gradle build tools to 2.2.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cc020c79..29d2de8a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 544ec4958b784ebe0da2182bc6f3d40c802c2019 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Fri, 28 Oct 2016 22:18:08 +0200 Subject: [PATCH 05/20] Allow multiple lines for name in "item_with_details" (fw upgrade log) --- app/src/main/res/layout/item_with_details.xml | 2 +- app/src/main/res/layout/item_with_details_small.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/item_with_details.xml b/app/src/main/res/layout/item_with_details.xml index b633bc63..6e16333f 100644 --- a/app/src/main/res/layout/item_with_details.xml +++ b/app/src/main/res/layout/item_with_details.xml @@ -28,7 +28,7 @@ android:scrollHorizontally="false" style="@style/Base.TextAppearance.AppCompat.SearchResult.Title" android:text="Item Name" - android:singleLine="true" /> + android:maxLines="1"/> + android:text="Item Name"/> Date: Fri, 28 Oct 2016 22:25:38 +0200 Subject: [PATCH 06/20] Mi2: Allow for disabling alarms #323 --- .../service/devices/miband/MiBand2Support.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java index d16edfc1..c463371d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java @@ -1061,7 +1061,6 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport { */ private void queueAlarm(Alarm alarm, TransactionBuilder builder, BluetoothGattCharacteristic characteristic) { Calendar calendar = alarm.getAlarmCal(); - int daysMask = 0; int maxAlarms = 5; // arbitrary at the moment... if (alarm.getIndex() >= maxAlarms) { @@ -1071,13 +1070,12 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport { return; } - if (alarm.isEnabled()) { - daysMask = alarm.getRepetitionMask(); - } + int daysMask = alarm.getRepetitionMask(); + int base = alarm.isEnabled() ? 128 : 0; byte[] alarmMessage = new byte[] { (byte) 0x2, // TODO what is this? - (byte) (128 + alarm.getIndex()), // 128 is the base, alarm slot is added + (byte) (base + alarm.getIndex()), // 128 is the base, alarm slot is added (byte) calendar.get(Calendar.HOUR_OF_DAY), (byte) calendar.get(Calendar.MINUTE), (byte) daysMask, From e5ade5c0efc4c1eb025e50b4be3019ad2041b5f8 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Fri, 28 Oct 2016 22:40:34 +0200 Subject: [PATCH 07/20] Add Alamr.isRepetitive() convenience method --- .../nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java | 7 +++++++ .../nodomain/freeyourgadget/gadgetbridge/model/Alarm.java | 2 ++ 2 files changed, 9 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java index 3a14da2b..54ac2e31 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java @@ -153,6 +153,11 @@ public class GBAlarm implements Alarm { return this.repetition; } + @Override + public boolean isRepetitive() { + return getRepetitionMask() != ALARM_ONCE; + } + public String toPreferences() { return String.valueOf(this.index) + ',' + String.valueOf(this.enabled) + ',' + @@ -209,10 +214,12 @@ public class GBAlarm implements Alarm { } public static final Creator CREATOR = new Creator() { + @Override public GBAlarm createFromParcel(Parcel in) { return readFromParcel(in); } + @Override public GBAlarm[] newArray(int size) { return new GBAlarm[size]; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java index 01adde47..1f2e461d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java @@ -26,5 +26,7 @@ public interface Alarm extends Parcelable, Comparable { int getRepetitionMask(); + boolean isRepetitive(); + boolean getRepetition(int dow); } From 3db9748136942806156f8e760ed5d256158d0138 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Fri, 28 Oct 2016 23:18:10 +0200 Subject: [PATCH 08/20] Mi2: Attempt to support non-repetitive alarms #323 --- .../service/devices/miband/MiBand2Support.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java index c463371d..c2ffb4b3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java @@ -1070,9 +1070,14 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport { return; } + int base = 0; + if (alarm.isEnabled()) { + base = 128; + } int daysMask = alarm.getRepetitionMask(); - int base = alarm.isEnabled() ? 128 : 0; - + if (!alarm.isRepetitive()) { + daysMask = 128; + } byte[] alarmMessage = new byte[] { (byte) 0x2, // TODO what is this? (byte) (base + alarm.getIndex()), // 128 is the base, alarm slot is added From e75f4f84e12c1c75a2e6e6ffe45de2eb04215d10 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Fri, 28 Oct 2016 23:27:25 +0200 Subject: [PATCH 09/20] Hint: you need to enable location for device discovery. --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 689b5b6d..0e501590 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -162,7 +162,7 @@ No valid user data given, using dummy user data for now. When your Mi Band vibrates and blinks, tap it a few times in a row. Install - Make your device discoverable. Currently connected devices will likely not be discovered. If your device does not show up after two minutes, try again after rebooting your mobile device. + Make your device discoverable. Currently connected devices will likely not be discovered. On Android 6 or later, you need to activate location (e.g. GPS). If your device does not show up after two minutes, try again after rebooting your mobile device. Note: Device Image Name/Alias From a941a6cd5fd690e1bebb523a13b51d1fb6b6d9bf Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Fri, 28 Oct 2016 23:47:39 +0200 Subject: [PATCH 10/20] Make some strings translatable --- .../devices/miband/MiBandPairingActivity.java | 8 ++++---- app/src/main/res/values/strings.xml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java index 48ab4078..14472ff5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java @@ -209,20 +209,20 @@ public class MiBandPairingActivity extends GBActivity { protected void performBluetoothPair(BluetoothDevice device) { int bondState = device.getBondState(); if (bondState == BluetoothDevice.BOND_BONDED) { - GB.toast("Already bonded with " + device.getName() + " (" + device.getAddress() + "), connecting...", Toast.LENGTH_SHORT, GB.INFO); + GB.toast(getString(R.string.miband_pairing_already_bonded, device.getName(), device.getAddress()), Toast.LENGTH_SHORT, GB.INFO); performPair(); return; } bondingMacAddress = device.getAddress(); if (bondState == BluetoothDevice.BOND_BONDING) { - GB.toast(this, "Bonding in progress: " + bondingMacAddress, Toast.LENGTH_LONG, GB.INFO); + GB.toast(this, getString(R.string.miband_pairing_in_progress, device.getName(), bondingMacAddress), Toast.LENGTH_LONG, GB.INFO); return; } - GB.toast(this, "Creating bond with" + bondingMacAddress, Toast.LENGTH_LONG, GB.INFO); + GB.toast(this, getString(R.string.miband_pairing_creating_bond_with, device.getName(), bondingMacAddress), Toast.LENGTH_LONG, GB.INFO); if (!device.createBond()) { - GB.toast(this, "Unable to pair with " + bondingMacAddress, Toast.LENGTH_LONG, GB.ERROR); + GB.toast(this, getString(R.string.miband_pairing_unable_to_pair_with, device.getName(), bondingMacAddress), Toast.LENGTH_LONG, GB.ERROR); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0e501590..262fee72 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -338,4 +338,8 @@ Vibration + "Creating bond with %1$s (%2$s)" + "Unable to pair with %1$s (%s$s)" + Bonding in progress: %1$s (%2$s) + "Already bonded with %1$s (%2$s), connecting…" From 1cadb692fe5ce12a9c4a5099ea236ef5e9c39574 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Fri, 28 Oct 2016 23:48:13 +0200 Subject: [PATCH 11/20] Wild guess at trying to fix spontaneous reboots during discovery #412 --- .../activities/DiscoveryActivity.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java index b7d81e74..6dd5cbc9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java @@ -63,17 +63,22 @@ public class DiscoveryActivity extends GBActivity implements AdapterView.OnItemC } break; case BluetoothAdapter.ACTION_DISCOVERY_FINISHED: - // continue with LE scan, if available - if (isScanning == Scanning.SCANNING_BT) { - checkAndRequestLocationPermission(); - if (GBApplication.isRunningLollipopOrLater()) { - startDiscovery(Scanning.SCANNING_NEW_BTLE); - } else { - startDiscovery(Scanning.SCANNING_BTLE); + handler.post(new Runnable() { + @Override + public void run() { + // continue with LE scan, if available + if (isScanning == Scanning.SCANNING_BT) { + checkAndRequestLocationPermission(); + if (GBApplication.isRunningLollipopOrLater()) { + startDiscovery(Scanning.SCANNING_NEW_BTLE); + } else { + startDiscovery(Scanning.SCANNING_BTLE); + } + } else { + discoveryFinished(); + } } - } else { - discoveryFinished(); - } + }); break; case BluetoothAdapter.ACTION_STATE_CHANGED: int oldState = intent.getIntExtra(BluetoothAdapter.EXTRA_PREVIOUS_STATE, BluetoothAdapter.STATE_OFF); From cea5f5fa36c3d16249f8c7a3674b95b809d35666 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sat, 29 Oct 2016 00:01:56 +0200 Subject: [PATCH 12/20] Remove duplicate case here as well --- .../gadgetbridge/service/devices/miband/MiBand2Support.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java index c2ffb4b3..20de3193 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBand2Support.java @@ -853,9 +853,6 @@ public class MiBand2Support extends AbstractBTLEDeviceSupport { } else if (MiBandService.UUID_CHARACTERISTIC_REALTIME_STEPS.equals(characteristicUUID)) { handleRealtimeSteps(characteristic.getValue()); return true; - } else if (MiBandService.UUID_CHARACTERISTIC_REALTIME_STEPS.equals(characteristicUUID)) { - handleRealtimeSteps(characteristic.getValue()); - return true; } else if (MiBandService.UUID_CHARACTERISTIC_HEART_RATE_MEASUREMENT.equals(characteristicUUID)) { handleHeartrate(characteristic.getValue()); return true; From 8187c6d2072be1c82bea02d824818c95472af103 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sat, 29 Oct 2016 00:43:59 +0200 Subject: [PATCH 13/20] Fix message placeholder --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 262fee72..f0d965cb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -339,7 +339,7 @@ Vibration "Creating bond with %1$s (%2$s)" - "Unable to pair with %1$s (%s$s)" + "Unable to pair with %1$s (%2$s)" Bonding in progress: %1$s (%2$s) "Already bonded with %1$s (%2$s), connecting…" From c2a9348c6ed97b57583de1da8da0d291a0182337 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sat, 29 Oct 2016 00:51:00 +0200 Subject: [PATCH 14/20] Upgrade mpandroidchart and robolectric --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cddd9398..95cfea57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,7 +60,7 @@ dependencies { // testCompile 'ch.qos.logback:logback-core:1.1.3' testCompile 'junit:junit:4.12' testCompile "org.mockito:mockito-core:1.9.5" - testCompile "org.robolectric:robolectric:3.1.2" + testCompile "org.robolectric:robolectric:3.1.3" compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.3.0' @@ -68,7 +68,7 @@ dependencies { compile 'com.android.support:design:23.3.0' compile 'com.github.tony19:logback-android-classic:1.1.1-4' compile 'org.slf4j:slf4j-api:1.7.7' - compile 'com.github.PhilJay:MPAndroidChart:3398cf4462bc7f49bb1156ef22040e8a0d63369f' + compile 'com.github.PhilJay:MPAndroidChart:v3.0.0' compile 'com.github.pfichtner:durationformatter:0.1.1' compile 'de.cketti.library.changelog:ckchangelog:1.2.2' compile 'net.e175.klaus:solarpositioning:0.0.9' From f755d9902340203460bc61f1c5f9d4006910fcfa Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sat, 29 Oct 2016 11:41:08 +0200 Subject: [PATCH 15/20] Pebble: Add context menu option in app manager to search a watchapp in the pebble appstore --- .../appmanager/AbstractAppManagerFragment.java | 14 ++++++++++++++ app/src/main/res/menu/appmanager_context.xml | 3 +++ app/src/main/res/values/strings.xml | 9 +++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java index 6389e5d6..18be286e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java @@ -287,6 +287,14 @@ public abstract class AbstractAppManagerFragment extends Fragment { if (!selectedApp.isConfigurable()) { menu.removeItem(R.id.appmanager_app_configure); } + switch (selectedApp.getType()) { + case WATCHFACE: + case APP_GENERIC: + case APP_ACTIVITYTRACKER: + break; + default: + menu.removeItem(R.id.appmanager_app_openinstore); + } //menu.setHeaderTitle(selectedApp.getName()); popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { @@ -354,6 +362,12 @@ public abstract class AbstractAppManagerFragment extends Fragment { startIntent.putExtra(GBDevice.EXTRA_DEVICE, mGBDevice); startActivity(startIntent); return true; + case R.id.appmanager_app_openinstore: + String url = "https://apps.getpebble.com/en_US/search/" + ((selectedApp.getType() == GBDeviceApp.Type.WATCHFACE) ? "watchfaces" : "watchapps") + "/1?query=" + selectedApp.getName() + "&dev_settings=true"; + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse(url)); + startActivity(intent); + return true; default: return super.onContextItemSelected(item); } diff --git a/app/src/main/res/menu/appmanager_context.xml b/app/src/main/res/menu/appmanager_context.xml index 873e0c24..8a2cadca 100644 --- a/app/src/main/res/menu/appmanager_context.xml +++ b/app/src/main/res/menu/appmanager_context.xml @@ -18,4 +18,7 @@ + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f0d965cb..3666b6d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,6 +25,7 @@ Delete Delete and remove from cache Reinstall + Open in Pebble Appstore Activate Deactivate Configure @@ -151,6 +152,10 @@ Use the Android Bluetooth Pairing dialog to pair the device. Pair your Mi Band Pairing with %s… + "Creating bond with %1$s (%2$s)" + "Unable to pair with %1$s (%2$s)" + Bonding in progress: %1$s (%2$s) + "Already bonded with %1$s (%2$s), connecting…" No mac address passed, cannot pair. Device Specific Settings Mi Band Settings @@ -338,8 +343,4 @@ Vibration - "Creating bond with %1$s (%2$s)" - "Unable to pair with %1$s (%2$s)" - Bonding in progress: %1$s (%2$s) - "Already bonded with %1$s (%2$s), connecting…" From 5b736909720a7eb05e654bd6606aa5058f422c1c Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sat, 29 Oct 2016 12:00:27 +0200 Subject: [PATCH 16/20] update changelogs again (mi band 2 stuff missing) --- CHANGELOG.md | 1 + app/src/main/res/xml/changelog_master.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85bd2d5f..e12e31dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ####Version 0.13.7 * Pebble: Fix configuration of certain pebble apps (eg. QR Generator, Squared 4.0) +* Pebble: Add context menu option in app manager to search a watchapp in the pebble appstore * Mi Band: allow to delete Mi Band address from development settings * Mi Band 2: Some initial hacky support for hr readings (Debug activity only) diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index f778baba..8992b96b 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -2,6 +2,7 @@ Pebble: Fix configuration of certain pebble apps (eg. QR Generator, Squared 4.0) + Pebble: Add context menu option in app manager to search a watchapp in the pebble appstore Mi Band: allow to delete Mi Band address from development settings Mi Band 2: Some initial hacky support for hr readings (Debug activity only) From e0d78e820895a69fd967b59c040709ba81eda951 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sat, 29 Oct 2016 12:58:19 +0200 Subject: [PATCH 17/20] update German and Japanese from transifex (thianks!) --- app/src/main/res/values-de/strings.xml | 20 ++++++++++++++++---- app/src/main/res/values-ja/strings.xml | 5 ++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4f1b334c..4275efca 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -10,6 +10,9 @@ Suche verlegtes Gerät… Bildschirmfoto Trennen + Gerät Löschen + %1$s Löschen + Das wird das Gerät und die dazugehörigen Daten löschen! Debug App Manager @@ -52,6 +55,7 @@ SMS K9-Mail Pebble Nachrichten + Unterstützung für Anwendungen die Benachrichtigungen an die Pebble via PebbleKit senden. Andere Benachrichtigungen … auch wenn der Bildschirm an ist Bitte nicht stören @@ -102,6 +106,7 @@ Bluetooth ist abgeschaltet. berühre das verbundene Gerät, um den App Manager zu starten Tippe auf das verbundene Gerät um die Aktivitätsdaten anzuzeigen + Tippe auf das verbundene Gerät um zu vibrieren berühre ein Gerät zum Verbinden Verbindung kann nicht aufgebaut werden. BT Adresse ungültig? Gadgetbridge läuft @@ -133,7 +138,8 @@ Keine gültigen Benutzerinformationen angegeben, verwende Dummy-Daten für\'s Erste. Wenn Dein Mi Band vibriert und blinkt, tippe ein paar Mal schnell hintereinander darauf. Installieren - Mach Dein Gerät auffindbar. Derzeit verbundene Geräte sind in der Regel nicht auffindbar. Wenn Dein Gerät nach zwei Minuten nicht angezeigt wird, versuche es nach einem Neustart Deines Telefons noch einmal. + Mach Dein Gerät auffindbar. Derzeit verbundene Geräte sind in der Regel nicht auffindbar. Android 6 oder neuer braucht dafür Standortbestimmung (z.B. GPS). Wenn Dein Gerät nach zwei Minuten nicht + angezeigt wird, versuche es nach einem Neustart Deines Telefons noch einmal. Tipp: Bild des Geräts Name/Alias @@ -153,12 +159,15 @@ Ring Wecker Vibration + Test SMS Benachrichtigung Vibrationseinstellungen Sonstige Benachrichtigung - Pebble Benachrichtigung - E-Mail Benachrichtigung - Benachrichtigung für eingehende Anrufe + E-Mail + Eingehende Anrufe + Chat + Navigation + Soziales Netzwerk Verlegtes Gerät suchen Abbrechen um die Vibration zu stoppen. Deine Aktivität @@ -274,6 +283,7 @@ Wenn Du schon deine Daten importiert hast und mit dem Ergebnis zufrieden bist, k Daten importieren? Import erfolgreich. Fehler beim Importieren der DB: %1$s + Führe Aktivitätsdaten zusammen Alte Daten löschen? Daten erfolgreich gelöscht. Löschen der Datenbank fehlgeschlagen. @@ -283,4 +293,6 @@ Wenn Du schon deine Daten importiert hast und mit dem Ergebnis zufrieden bist, k Überschreiben Abbrechen Löschen + + Vibration diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 38490a67..34eee75a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -138,7 +138,7 @@ 有効なユーザーデータはありません。今のところ、ダミーのユーザーデータを使用します。 お使いのMi Bandが振動と点滅したとき、それを連続して数回タップしてください。 インストール - お使いのデバイスを検出可能にしてください。現在、接続されたデバイスは、おそらく検出されません。お使いのデバイスが 2 分しても表示されない場合は、モバイルデバイスを再起動した後にもう一度試してください。 + お使いのデバイスを検出可能にしてください。現在、接続されたデバイスは、おそらく検出されません。Android 6 以降では位置情報を有効にする必要があります (例 GPS)。お使いのデバイスが 2 分しても表示されない場合は、モバイルデバイスを再起動した後にもう一度試してください。 注: デバイスイメージ 名前/別名 @@ -302,4 +302,7 @@ Mi Band、Pebble Health、Morpheuz からデータをインポートすること 削除 バイブレーション + %1$s (%2$s) と結合を作成中 + 結合の進行中: %1$s (%2$s) + 既に %1$s (%2$s) と結合しています。接続中… From d442030c2a803c88e2dd58f14eaf11df3cc63816 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sat, 29 Oct 2016 15:55:27 +0200 Subject: [PATCH 18/20] Revert to robolectric 3.1.2 as 3.1.3 does not work at all. --- app/build.gradle | 2 +- .../nodomain/freeyourgadget/gadgetbridge/test/TestBase.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 95cfea57..da90c4b1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,7 +60,7 @@ dependencies { // testCompile 'ch.qos.logback:logback-core:1.1.3' testCompile 'junit:junit:4.12' testCompile "org.mockito:mockito-core:1.9.5" - testCompile "org.robolectric:robolectric:3.1.3" + testCompile "org.robolectric:robolectric:3.1.2" compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.3.0' diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/TestBase.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/TestBase.java index a7120bfd..91f25328 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/TestBase.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/TestBase.java @@ -10,7 +10,6 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowLog; import java.io.File; @@ -41,7 +40,8 @@ public abstract class TestBase { @BeforeClass public static void setupSuite() throws Exception { // print everything going to android.util.Log to System.out - ShadowLog.stream = System.out; + System.setProperty("robolectric.logging", "stdout"); +// ShadowLog.stream = System.out; // properties might be preconfigured in build.gradle because of test ordering problems String logDir = System.getProperty(Logging.PROP_LOGFILES_DIR); From a4f615ce71ed306c9d676b1655002ee24f4b4e69 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sat, 29 Oct 2016 16:08:20 +0200 Subject: [PATCH 19/20] Update changelog for 3.1.3 --- CHANGELOG.md | 5 ++++- app/src/main/res/xml/changelog_master.xml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e12e31dc..7eec8740 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,10 @@ * Pebble: Fix configuration of certain pebble apps (eg. QR Generator, Squared 4.0) * Pebble: Add context menu option in app manager to search a watchapp in the pebble appstore * Mi Band: allow to delete Mi Band address from development settings -* Mi Band 2: Some initial hacky support for hr readings (Debug activity only) +* Mi Band 2: Initial support for heart rate readings (Debug activity only) +* Mi Band 2: Support disabled alarms +* Attempt to fix spurious device discovery problems +* Update MPAndroidChart to release 3.0 ####Version 0.13.6 * Mi Band 2: Support for multiple alarms (3 at the moment) diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index 8992b96b..b3455775 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -4,7 +4,10 @@ Pebble: Fix configuration of certain pebble apps (eg. QR Generator, Squared 4.0) Pebble: Add context menu option in app manager to search a watchapp in the pebble appstore Mi Band: allow to delete Mi Band address from development settings - Mi Band 2: Some initial hacky support for hr readings (Debug activity only) + Mi Band 2: Initial support for heart rate readings (Debug activity only) + Mi Band 2: Support disabled alarms + Attempt to fix spurious device discovery problems + Update MPAndroidChart to release 3.0 Mi Band 2: Support multiple alarms (3 at the moment) From e2a9574406934e80667b9724fc2e87bb54003c8c Mon Sep 17 00:00:00 2001 From: Daniele Gobbetti Date: Sat, 29 Oct 2016 16:27:31 +0200 Subject: [PATCH 20/20] Add logic to open zip files. Lately pebble apps are recognized as such. --- app/src/main/AndroidManifest.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3c3c718a..ee643206 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -182,6 +182,15 @@ + + + + + + + + +