MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-28 21:06:50 +01:00
Code Releases Wiki Activity

Mi Band 3: Fix messages not being displayed (send app source with notifications and use chunked characteristics where available)

Browse Source 
This also sends the app name for Bip and Cor, which is actually displayed when there is no icon (unknown app for the device)

Fixes #1203
This commit is contained in:
Andreas Shimokawa 2018-08-19 00:35:50 +02:00
parent eb9264c3d3
commit 3d70314e8c
1 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java
View File

@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip;
import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattCharacteristic;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -92,11 +94,8 @@ public class AmazfitBipSupport extends HuamiSupport {
try { try {
TransactionBuilder builder = performInitialized("new notification"); TransactionBuilder builder = performInitialized("new notification");
AlertNotificationProfile<?> profile = new AlertNotificationProfile(this);
profile.setMaxLength(230);
byte customIconId = HuamiIcon.mapToIconId(notificationSpec.type); byte customIconId = HuamiIcon.mapToIconId(notificationSpec.type);
AlertCategory alertCategory = AlertCategory.CustomHuami; AlertCategory alertCategory = AlertCategory.CustomHuami;
// The SMS icon for AlertCategory.SMS is unique and not available as iconId // The SMS icon for AlertCategory.SMS is unique and not available as iconId
@ -108,8 +107,55 @@ public class AmazfitBipSupport extends HuamiSupport {
alertCategory = AlertCategory.Email; alertCategory = AlertCategory.Email;
} }
NewAlert alert = new NewAlert(alertCategory, 1, message, customIconId); int maxLength = 230;
profile.newAlert(builder, alert); if (characteristicChunked != null) {
int prefixlength = 2;
int suffixlength = 0;
byte[] appSuffix = null;
if (alertCategory == AlertCategory.CustomHuami) {
String appName;
prefixlength = 3;
final PackageManager pm = getContext().getPackageManager();
ApplicationInfo ai = null;
try {
ai = pm.getApplicationInfo(notificationSpec.sourceAppId, 0);
} catch (PackageManager.NameNotFoundException ignored) {
}
if (ai != null) {
appName = "\0" + pm.getApplicationLabel(ai) + "\0";
} else {
appName = "\0" + "unknown app" + "\0";
}
appSuffix = appName.getBytes();
suffixlength = appSuffix.length;
}
byte[] rawmessage = message.getBytes();
int length = Math.min(rawmessage.length, maxLength - prefixlength);
byte[] command = new byte[length + prefixlength + suffixlength];
command[0] = (byte) alertCategory.getId();
command[1] = 1;
if (alertCategory == AlertCategory.CustomHuami) {
command[2] = customIconId;
}
System.arraycopy(rawmessage, 0, command, prefixlength, length);
if (appSuffix != null) {
System.arraycopy(appSuffix, 0, command, prefixlength + length, appSuffix.length);
}
writeToChunked(builder, 0, command);
} else {
AlertNotificationProfile<?> profile = new AlertNotificationProfile(this);
NewAlert alert = new NewAlert(alertCategory, 1, message, customIconId);
profile.setMaxLength(maxLength);
profile.newAlert(builder, alert);
}
builder.queue(getQueue()); builder.queue(getQueue());
} catch (IOException ex) { } catch (IOException ex) {
LOG.error("Unable to send notification to Amazfit Bip", ex); LOG.error("Unable to send notification to Amazfit Bip", ex);