mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 06:35:09 +00:00
Code Issues Releases Wiki Activity

Remove outdated comments

Browse Source
This commit is contained in:
Albert Vaca Cintora
2023-05-24 15:55:06 +02:00
parent e372c47789
commit f6ea3e01b0
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/kde/kdeconnect/Device.java
View File

@@ -692,12 +692,10 @@ public class Device implements BaseLink.PacketReceiver {
*/ */
boolean success = false; boolean success = false;
//Make a copy to avoid concurrent modification exception if the original list changes
for (final BaseLink link : links) { for (final BaseLink link : links) {
if (link == null) if (link == null) continue;
continue; //Since we made a copy, maybe somebody destroyed the link in the meanwhile
success = link.sendPacket(np, callback); success = link.sendPacket(np, callback);
if (success) break; //If the link didn't call sendSuccess(), try the next one if (success) break;
} }
if (!success) { if (!success) {

7
src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java
View File

@@ -546,7 +546,7 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
} else if (np.has("cancel")) { } else if (np.has("cancel")) {
final String dismissedId = np.getString("cancel"); final String dismissedId = np.getString("cancel");
currentNotifications.remove(dismissedId); currentNotifications.remove(dismissedId);
NotificationReceiver.RunCommand(context, service -> cancelNotificationCompat(service, dismissedId)); NotificationReceiver.RunCommand(context, service -> service.cancelNotification(dismissedId));
} else if (np.has("requestReplyId") && np.has("message")) { } else if (np.has("requestReplyId") && np.has("message")) {
replyToNotification(np.getString("requestReplyId"), np.getString("message")); replyToNotification(np.getString("requestReplyId"), np.getString("message"));
} }
@@ -577,11 +577,6 @@ public class NotificationsPlugin extends Plugin implements NotificationReceiver.
return new String[]{PACKET_TYPE_NOTIFICATION}; return new String[]{PACKET_TYPE_NOTIFICATION};
} }
//For compat with API<21, because lollipop changed the way to cancel notifications
private static void cancelNotificationCompat(NotificationReceiver service, String compatKey) {
service.cancelNotification(compatKey);
}
private static String getNotificationKeyCompat(StatusBarNotification statusBarNotification) { private static String getNotificationKeyCompat(StatusBarNotification statusBarNotification) {
String result; String result;
// first check if it's one of our remoteIds // first check if it's one of our remoteIds