demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Garmin: Fix empty caller when unknown

Browse Source
This commit is contained in:
José Rebelo
2026-05-23 15:15:58 +01:00
parent 43eb4bc4b7
commit 89e495c6b1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/NotificationsHandler.java
+5 -3
View File
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Queue; import java.util.Queue;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
import nodomain.freeyourgadget.gadgetbridge.model.CallSpec; import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
@@ -80,12 +81,13 @@ public class NotificationsHandler implements MessageHandler {
return null; return null;
final int id = StringUtils.firstNonBlank(callSpec.number, "Gadgetbridge Call").hashCode(); final int id = StringUtils.firstNonBlank(callSpec.number, "Gadgetbridge Call").hashCode();
if (callSpec.command == CallSpec.CALL_INCOMING) { if (callSpec.command == CallSpec.CALL_INCOMING) {
NotificationSpec callNotificationSpec = new NotificationSpec(id); final String caller = StringUtils.firstNonBlank(callSpec.name, callSpec.number, GBApplication.getContext().getString(R.string.unknown));
final NotificationSpec callNotificationSpec = new NotificationSpec(id);
callNotificationSpec.phoneNumber = callSpec.number; callNotificationSpec.phoneNumber = callSpec.number;
callNotificationSpec.sourceAppId = callSpec.sourceAppId; callNotificationSpec.sourceAppId = callSpec.sourceAppId;
callNotificationSpec.title = StringUtils.isEmpty(callSpec.name) ? callSpec.number : callSpec.name; callNotificationSpec.title = caller;
callNotificationSpec.type = NotificationType.GENERIC_PHONE; callNotificationSpec.type = NotificationType.GENERIC_PHONE;
callNotificationSpec.body = StringUtils.isEmpty(callSpec.name) ? callSpec.number : callSpec.name; callNotificationSpec.body = caller;
// add an empty bogus action to toggle the hasActions boolean. The actions are hardcoded on the watch in case of incoming calls. // add an empty bogus action to toggle the hasActions boolean. The actions are hardcoded on the watch in case of incoming calls.
callNotificationSpec.attachedActions = new ArrayList<>(); callNotificationSpec.attachedActions = new ArrayList<>();