demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-25 16:15:55 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Mi Band 8: Fix notification icons for long package names

Browse Source
This commit is contained in:
José Rebelo 2023-10-28 15:49:56 +01:00
parent 8192106fc0
commit 516b3dbf1e
1 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
View File

@ -30,7 +30,9 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.LinkedList;
import java.util.Locale; import java.util.Locale;
import java.util.Queue;
import nodomain.freeyourgadget.gadgetbridge.BuildConfig; import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
@ -60,6 +62,10 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
public static final int CMD_NOTIFICATION_ICON_REQUEST = 15; public static final int CMD_NOTIFICATION_ICON_REQUEST = 15;
public static final int CMD_NOTIFICATION_ICON_QUERY = 16; public static final int CMD_NOTIFICATION_ICON_QUERY = 16;
// Maintain a queue of the last seen package names, since the band will send
// requests with the package name truncated, and without an ID
private final Queue<String> mPackages = new LinkedList<>();
private String iconPackageName; private String iconPackageName;
public XiaomiNotificationService(final XiaomiSupport support) { public XiaomiNotificationService(final XiaomiSupport support) {
@ -101,19 +107,7 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
handleNotificationIconRequest(cmd.getNotification().getNotificationIconRequest()); handleNotificationIconRequest(cmd.getNotification().getNotificationIconRequest());
return; return;
case CMD_NOTIFICATION_ICON_QUERY: case CMD_NOTIFICATION_ICON_QUERY:
this.iconPackageName = cmd.getNotification().getNotificationIconQuery().getPackage(); handleNotificationIconQuery(cmd.getNotification().getNotificationIconQuery());
LOG.debug("Watch querying notification icon for {}", iconPackageName);
// TODO should we confirm that we have the icon before replying?
getSupport().sendCommand(
"send notification reply for " + iconPackageName,
XiaomiProto.Command.newBuilder()
.setType(COMMAND_TYPE)
.setSubtype(CMD_NOTIFICATION_ICON_REQUEST)
.setNotification(XiaomiProto.Notification.newBuilder()
.setNotificationIconReply(cmd.getNotification().getNotificationIconQuery())
).build()
);
return; return;
} }
@ -134,6 +128,11 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
notification3.setPackage(BuildConfig.APPLICATION_ID); notification3.setPackage(BuildConfig.APPLICATION_ID);
} }
mPackages.add(notification3.getPackage());
if (mPackages.size() > 32) {
mPackages.poll();
}
final String senderOrTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title); final String senderOrTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
if (!senderOrTitle.isEmpty()) { if (!senderOrTitle.isEmpty()) {
notification3.setTitle(senderOrTitle); notification3.setTitle(senderOrTitle);
@ -299,6 +298,42 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
} }
} }
private void handleNotificationIconQuery(final XiaomiProto.NotificationIconPackage notificationIconPackage) {
LOG.debug("Watch querying notification icon for {}", notificationIconPackage.getPackage());
iconPackageName = notificationIconPackage.getPackage();
if (NotificationUtils.getAppIcon(getSupport().getContext(), iconPackageName) == null) {
// Attempt to find truncated package name
for (final String fullPackage : mPackages) {
if (fullPackage.startsWith(iconPackageName)) {
iconPackageName = fullPackage;
break;
}
}
if (iconPackageName.equals(notificationIconPackage.getPackage())) {
LOG.warn("Failed to match a full package for {}", iconPackageName);
return;
}
if (NotificationUtils.getAppIcon(getSupport().getContext(), iconPackageName) == null) {
LOG.warn("Failed to find icon for {} and {}", notificationIconPackage.getPackage(), iconPackageName);
return;
}
}
getSupport().sendCommand(
"send notification reply for " + iconPackageName,
XiaomiProto.Command.newBuilder()
.setType(COMMAND_TYPE)
.setSubtype(CMD_NOTIFICATION_ICON_REQUEST)
.setNotification(XiaomiProto.Notification.newBuilder()
.setNotificationIconReply(notificationIconPackage)
).build()
);
}
private void handleNotificationIconRequest(final XiaomiProto.NotificationIconRequest notificationIconRequest) { private void handleNotificationIconRequest(final XiaomiProto.NotificationIconRequest notificationIconRequest) {
if (iconPackageName == null) { if (iconPackageName == null) {
LOG.warn("No icon package name"); LOG.warn("No icon package name");