Merge branch 'master' into background-javascript

CHANGELOG.md

@@ -1,5 +1,13 @@
 ### Changelog
 
+#### Version 0.21.2
+* Amazfit Bip: Support flashing CEP and ALM files for AGPS
+* Amazfit Bip: Initial experimental support for fetching logs from the watch
+* Mi2/Bip: Send user info to the device (fixes calories and distance display)
+* Mi2/Bip: Fix firmware update progressbar being stuck at the end
+* Pebble/Bip: Support more notification icons
+* Pebble: Automatically determine color for unknown notifications on Pebble Time
+
 #### Version 0.21.1
 * Initial support for EXRIZU K8 (HPLus variant)
 * Amazfit Bip: fix long messages not being displayed at all

app/build.gradle

@@ -26,8 +26,8 @@ android {
         targetSdkVersion 25
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.21.1"
+        versionName "0.21.2"
-        versionCode 102
+        versionCode 103
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband2/MiBand2Icon.java

@@ -66,8 +66,13 @@ public class MiBand2Icon {
             case UNKNOWN:
                 return APP_11;
             case CONVERSATIONS:
+            case RIOT:
+            case HIPCHAT:
                 return WECHAT;
             case GENERIC_EMAIL:
+            case GMAIL:
+            case YAHOO_MAIL:
+            case OUTLOOK:
                 return EMAIL;
             case GENERIC_NAVIGATION:
                 return APP_11;
@@ -80,15 +85,15 @@ public class MiBand2Icon {
             case FACEBOOK_MESSENGER:
                 return FACEBOOK_MESSENGER;
             case GOOGLE_HANGOUTS:
+            case GOOGLE_MESSENGER:
                 return HANGOUTS;
             case INSTAGRAM:
+            case GOOGLE_PHOTOS:
                 return INSTAGRAM;
             case KAKAO_TALK:
                 return KAKAOTALK;
             case LINE:
                 return LINE;
-            case RIOT:
-                return WECHAT;
             case SIGNAL:
                 return CHAT_BLUE_13;
             case TWITTER:

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/UpdateFirmwareOperation.java

@@ -91,6 +91,18 @@ public class UpdateFirmwareOperation extends AbstractMiBand2Operation {
         unsetBusy();
     }
 
+    @Override
+    public boolean onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        if (status != BluetoothGatt.GATT_SUCCESS) {
+            operationFailed();
+        }
+        return super.onCharacteristicWrite(gatt, characteristic, status);
+    }
+
+    private void operationFailed() {
+        GB.updateInstallNotification(getContext().getString(R.string.updatefirmwareoperation_write_failed), false, 0, getContext());
+    }
+
     @Override
     public boolean onCharacteristicChanged(BluetoothGatt gatt,
                                            BluetoothGattCharacteristic characteristic) {
@@ -154,6 +166,7 @@ public class UpdateFirmwareOperation extends AbstractMiBand2Operation {
                     default: {
                         LOG.error("Unexpected response during firmware update: ");
                         getSupport().logMessageContent(value);
+                        operationFailed();
                         displayMessage(getContext(), getContext().getString(R.string.updatefirmwareoperation_updateproblem_do_not_reboot), Toast.LENGTH_LONG, GB.ERROR);
                         done();
                         return;
@@ -165,6 +178,7 @@ public class UpdateFirmwareOperation extends AbstractMiBand2Operation {
             }
         } else {
             LOG.error("Unexpected notification during firmware update: ");
+            operationFailed();
             getSupport().logMessageContent(value);
             displayMessage(getContext(), getContext().getString(R.string.updatefirmwareoperation_metadata_updateproblem), Toast.LENGTH_LONG, GB.ERROR);
             done();

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java

@@ -113,7 +113,7 @@ public class GBMusicControlReceiver extends BroadcastReceiver {
                 MediaController controller = controllers.get(0);
                 audioPlayer = controller.getPackageName();
             } catch (IndexOutOfBoundsException e) {
-                LOG.error("IndexOutOfBoundsException: " + e.getMessage());
+                LOG.error("No media controller available", e);
             }
         }
         return audioPlayer;

app/src/main/res/xml/changelog_master.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.21.2" versioncode="103">
+        <change>Amazfit Bip: Support flashing CEP and ALM files for AGPS</change>
+        <change>Amazfit Bip: Initial experimental support for fetching logs from the watch</change>
+        <change>Mi2/Bip: Send user info to the device (fixes calories and distance display)</change>
+        <change>Mi2/Bip: Fix firmware update progressbar being stuck at the end</change>
+        <change>Pebble/Bip: Support more notification icons</change>
+        <change>Pebble: Automatically determine color for unknown notifications on Pebble Time</change>
+    </release>
     <release version="0.21.1" versioncode="102">
         <change>Initial support for EXRIZU K8 (HPLus variant)</change>
         <change>Amazfit Bip: fix long messages not being displayed at all</change>

fastlane/metadata/android/en-US/changelogs/103.txt

@@ -0,0 +1,6 @@
+* Amazfit Bip: Support flashing CEP and ALM files for AGPS
+* Amazfit Bip: Initial experimental support for fetching logs from the watch
+* Mi2/Bip: Send user info to the device (fixes calories and distance display)
+* Mi2/Bip: Fix firmware update progressbar being stuck at the end
+* Pebble/Bip: Support more notification icons
+* Pebble: Automatically determine color for unknown notifications on Pebble Time