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

Determined which icons take header, fixed email

Browse Source
This commit is contained in:
musover 2021-11-23 21:38:53 +01:00 committed by Gitea
parent 69c1c1b989
commit d5eb5b0690
2 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java
View File

@ -32,14 +32,14 @@ public class HuamiIcon {
public static final byte SNAPCHAT = 6; public static final byte SNAPCHAT = 6;
public static final byte WHATSAPP = 7; public static final byte WHATSAPP = 7;
public static final byte RED_WHITE_FIRE_8 = 8; public static final byte RED_WHITE_FIRE_8 = 8;
public static final byte CHINESE_9 = 9; //taobao public static final byte CHINESE_9 = 9;
public static final byte ALARM_CLOCK = 10; public static final byte ALARM_CLOCK = 10;
public static final byte APP_11 = 11; public static final byte APP_11 = 11;
public static final byte INSTAGRAM = 12; public static final byte INSTAGRAM = 12;
public static final byte CHAT_BLUE_13 = 13; public static final byte CHAT_BLUE_13 = 13;
public static final byte COW_14 = 14; public static final byte COW_14 = 14;
public static final byte CHINESE_15 = 15; // sender disregarded (amazfit) public static final byte CHINESE_15 = 15;
public static final byte CHINESE_16 = 16; // sender disregarded (amazfit) public static final byte CHINESE_16 = 16;
public static final byte STAR_17 = 17; public static final byte STAR_17 = 17;
public static final byte APP_18 = 18; public static final byte APP_18 = 18;
public static final byte CHINESE_19 = 19; public static final byte CHINESE_19 = 19;
@ -99,7 +99,6 @@ public class HuamiIcon {
return LINE; return LINE;
case WIRE: case WIRE:
case THREEMA: case THREEMA:
case DISCORD:
return CHAT_BLUE_13; return CHAT_BLUE_13;
case TWITTER: case TWITTER:
return TWITTER; return TWITTER;
@ -110,6 +109,7 @@ public class HuamiIcon {
case TELEGRAM: case TELEGRAM:
return TELEGRAM; return TELEGRAM;
case VIBER: case VIBER:
case DISCORD:
return VIBER; return VIBER;
case WHATSAPP: case WHATSAPP:
return WHATSAPP; return WHATSAPP;
@ -118,4 +118,30 @@ public class HuamiIcon {
} }
return APP_11; return APP_11;
} }
//amazfit workaround
public static boolean acceptsSender(byte iconId){
switch(iconId){
case WECHAT:
case PENGUIN_1:
case MI_CHAT_2:
case SNAPCHAT:
case WHATSAPP:
case RED_WHITE_FIRE_8:
case INSTAGRAM:
case CHAT_BLUE_13:
case COW_14:
case CHINESE_20:
case FACEBOOK_MESSENGER:
case VIBER:
case LINE:
case TELEGRAM:
case VKONTAKTE:
case CHINESE_32:
case EMAIL:
return true;
}
return false;
}
} }

54
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniSupport.java
View File

@ -56,23 +56,39 @@ public class AmazfitGTS2MiniSupport extends AmazfitGTS2Support {
@Override @Override
protected void sendNotificationNew(NotificationSpec notificationSpec, boolean hasExtraHeader, int maxLength) { protected void sendNotificationNew(NotificationSpec notificationSpec, boolean hasExtraHeader, int maxLength) {
// step 1: bail out if this is an alarm clock notification
if (notificationSpec.type == NotificationType.GENERIC_ALARM_CLOCK) { if (notificationSpec.type == NotificationType.GENERIC_ALARM_CLOCK) {
onAlarmClock(notificationSpec); onAlarmClock(notificationSpec);
return; return;
} }
String senderOrTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title); // step 2: (formerly in try block) get notification type
AlertCategory alertCategory = AlertCategory.CustomHuami;
byte customIconId = HuamiIcon.mapToIconId(notificationSpec.type);
String message = StringUtils.truncate(senderOrTitle, 64) + "\0"; // step 3: build notification (sender+body)
/*
* Format followed by the device:
* <SENDER> \0 <BODY> \0 <APP SUFFIX>
* sender will get ignored except for the icons
* specified on the HuamiIcon class.
* for email, App Suffix will be taken as sender
*/
String senderOrTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
boolean acceptsSender = HuamiIcon.acceptsSender(customIconId);
String message;
if (!acceptsSender && !senderOrTitle.equals(notificationSpec.sourceName)) {
// make sure we always include the notification sender/title
message = "-\0"; //leave title blank, it's useless
message += StringUtils.truncate(senderOrTitle, 64) + "\n";
} else {
message = StringUtils.truncate(senderOrTitle, 64) + "\0";
}
if (notificationSpec.subject != null) { if (notificationSpec.subject != null) {
message += StringUtils.truncate(notificationSpec.subject, 128) + "\n\n"; message += StringUtils.truncate(notificationSpec.subject, 128) + "\n\n";
} else {
if (!notificationSpec.type.getGenericType().equals("generic_chat") && !senderOrTitle.equals(notificationSpec.sourceName)) {
// amazfit devices will disregard the title if not a chat app, so we have to include it again
message = "-\0"; //leave title blank, it's useless
message += StringUtils.truncate(senderOrTitle, 64) + "\n";
}
} }
if (notificationSpec.body != null) { if (notificationSpec.body != null) {
message += StringUtils.truncate(notificationSpec.body, 512); message += StringUtils.truncate(notificationSpec.body, 512);
@ -84,25 +100,24 @@ public class AmazfitGTS2MiniSupport extends AmazfitGTS2Support {
try { try {
TransactionBuilder builder = performInitialized("new notification"); TransactionBuilder builder = performInitialized("new notification");
byte customIconId = HuamiIcon.mapToIconId(notificationSpec.type); // step 4: append suffix
AlertCategory alertCategory = AlertCategory.CustomHuami; byte[] appSuffix = "\0 \0".getBytes();
int suffixlength = appSuffix.length;
// 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
if (notificationSpec.type == NotificationType.GENERIC_SMS) { if (notificationSpec.type == NotificationType.GENERIC_SMS) {
alertCategory = AlertCategory.SMS; alertCategory = AlertCategory.SMS;
} }
// EMAIL icon does not work in FW 0.0.8.74, it did in 0.0.7.90 // EMAIL icon does not work in FW 0.0.8.74, it did in 0.0.7.90 (old comment)
// EMAIL will take the sender from the suffix instead
else if (customIconId == HuamiIcon.EMAIL) { else if (customIconId == HuamiIcon.EMAIL) {
alertCategory = AlertCategory.Email; alertCategory = AlertCategory.Email;
appSuffix = ("\0"+senderOrTitle+"\0").getBytes();
suffixlength = appSuffix.length;
} }
// if I understood correctly, we don't need the extra logic for mi band 2 here // if I understood correctly, we don't need the extra logic for mi band 2 here
int prefixlength = 2; int prefixlength = 2;
// We also need a (fake) source name for Mi Band 3 for SMS/EMAIL, else the message is not displayed
byte[] appSuffix = "\0 \0".getBytes();
int suffixlength = appSuffix.length;
if (alertCategory == AlertCategory.CustomHuami) { if (alertCategory == AlertCategory.CustomHuami) {
String appName; String appName;
prefixlength = 3; prefixlength = 3;
@ -113,10 +128,10 @@ public class AmazfitGTS2MiniSupport extends AmazfitGTS2Support {
} catch (PackageManager.NameNotFoundException ignored) { } catch (PackageManager.NameNotFoundException ignored) {
} }
if (ai != null) { if (ai == null) {
appName = "\0" + pm.getApplicationLabel(ai) + "\0";
} else {
appName = "\0" + "UNKNOWN" + "\0"; appName = "\0" + "UNKNOWN" + "\0";
} else {
appName = "\0" + pm.getApplicationLabel(ai) + "\0";
} }
appSuffix = appName.getBytes(); appSuffix = appName.getBytes();
suffixlength = appSuffix.length; suffixlength = appSuffix.length;
@ -125,6 +140,7 @@ public class AmazfitGTS2MiniSupport extends AmazfitGTS2Support {
prefixlength += 4; prefixlength += 4;
} }
// final step: build command
byte[] rawmessage = message.getBytes(); byte[] rawmessage = message.getBytes();
int length = Math.min(rawmessage.length, maxLength - prefixlength); int length = Math.min(rawmessage.length, maxLength - prefixlength);
if (length < rawmessage.length) { if (length < rawmessage.length) {