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

InfiniTime: support title for notifications on firmware 0.15

Browse Source 
also drop support for firmware priror to 0.9
This commit is contained in:
Andreas Shimokawa 2021-04-05 13:05:24 +02:00
parent bb1df11650
commit 787216f1bc
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
View File

@ -258,19 +258,19 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
@Override
public void onNotification(NotificationSpec notificationSpec) {
TransactionBuilder builder = new TransactionBuilder("notification");
String message = notificationSpec.body;
if(!IsFirmwareAtLeastVersion0_9()) {
// Firmware versions prior to 0.9 ignore the last characters of the notification message
// Add an space character so that the whole message will be displayed
message += " ";
String message;
if (isFirmwareAtLeastVersion0_15()) {
String senderOrTitle = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
message = senderOrTitle + "\0" + notificationSpec.body;
} else {
message = notificationSpec.body;
}
NewAlert alert = new NewAlert(AlertCategory.CustomHuami, 1, message);
AlertNotificationProfile<?> profile = new AlertNotificationProfile<>(this);
if(IsFirmwareAtLeastVersion0_9()) {
// InfiniTime 0.9+ support notification message of up to 100 characters
// Instead of 18 by default
profile.setMaxLength(MaxNotificationLength);
}
profile.setMaxLength(MaxNotificationLength);
profile.newAlert(builder, alert, OverflowStrategy.TRUNCATE);
builder.queue(getQueue());
}
@ -656,7 +656,7 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
if(versionCmd.fwVersion != null && !versionCmd.fwVersion.isEmpty()) {
// FW version format : "major.minor.patch". Ex : "0.8.2"
String[] tokens = StringUtils.split(versionCmd.fwVersion, ".");
if(tokens.length == 3) {
if (tokens.length == 3) {
firmwareVersionMajor = Integer.parseInt(tokens[0]);
firmwareVersionMinor = Integer.parseInt(tokens[1]);
firmwareVersionPatch = Integer.parseInt(tokens[2]);
@ -666,8 +666,8 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
handleGBDeviceEvent(versionCmd);
}
private boolean IsFirmwareAtLeastVersion0_9() {
return firmwareVersionMajor > 0 || firmwareVersionMinor >= 9;
private boolean isFirmwareAtLeastVersion0_15() {
return firmwareVersionMajor > 0 || firmwareVersionMinor >= 15;
}
/**