MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-19 23:27:48 +01:00
Code Releases Wiki Activity

NotificationListener: fix obvious lint warnings

Browse Source
This commit is contained in:
Dmitriy Bogdanov 2020-03-11 14:18:58 +04:00 committed by Gitea
parent 94683a863d
commit 7016fd25c5
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
View File

@ -53,10 +53,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import de.greenrobot.dao.query.Query; import de.greenrobot.dao.query.Query;
import nodomain.freeyourgadget.gadgetbridge.BuildConfig; import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
@ -107,7 +109,7 @@ public class NotificationListener extends NotificationListenerService {
private HashMap<String, Long> notificationBurstPrevention = new HashMap<>(); private HashMap<String, Long> notificationBurstPrevention = new HashMap<>();
private HashMap<String, Long> notificationOldRepeatPrevention = new HashMap<>(); private HashMap<String, Long> notificationOldRepeatPrevention = new HashMap<>();
private static final List<String> groupSummaryWhitelist = Arrays.asList( private static final Set<String> GROUP_SUMMARY_WHITELIST = Collections.singleton(
"mikado.bizcalpro" "mikado.bizcalpro"
); );
@ -287,20 +289,22 @@ public class NotificationListener extends NotificationListenerService {
String source = sbn.getPackageName().toLowerCase(); String source = sbn.getPackageName().toLowerCase();
Notification notification = sbn.getNotification(); Notification notification = sbn.getNotification();
if (notificationOldRepeatPrevention.containsKey(source)) {
if (notification.when <= notificationOldRepeatPrevention.get(source)) { Long notificationOldRepeatPreventionValue = notificationOldRepeatPrevention.get(source);
LOG.info("NOT processing notification, already sent newer notifications from this source."); if (notificationOldRepeatPreventionValue != null
return; && notification.when <= notificationOldRepeatPreventionValue) {
} LOG.info("NOT processing notification, already sent newer notifications from this source.");
return;
} }
// Ignore too frequent notifications, according to user preference // Ignore too frequent notifications, according to user preference
long min_timeout = (long)prefs.getInt("notifications_timeout", 0) * 1000L; long curTime = System.nanoTime();
long cur_time = System.currentTimeMillis(); Long notificationBurstPreventionValue = notificationBurstPrevention.get(source);
if (notificationBurstPrevention.containsKey(source)) { if (notificationBurstPreventionValue != null) {
long last_time = notificationBurstPrevention.get(source); long diff = curTime - notificationBurstPreventionValue;
if (cur_time - last_time < min_timeout) { if (diff < TimeUnit.SECONDS.toNanos(prefs.getInt("notifications_timeout", 0))) {
LOG.info("Ignoring frequent notification, last one was " + (cur_time - last_time) + "ms ago"); LOG.info("Ignoring frequent notification, last one was "
+ TimeUnit.NANOSECONDS.toMillis(diff) + "ms ago");
return; return;
} }
} }
@ -356,7 +360,8 @@ public class NotificationListener extends NotificationListenerService {
List<NotificationCompat.Action> actions = wearableExtender.getActions(); List<NotificationCompat.Action> actions = wearableExtender.getActions();
if (actions.size() == 0 && NotificationCompat.isGroupSummary(notification) && !groupSummaryWhitelist.contains(source)) { //this could cause #395 to come back if (actions.isEmpty() && NotificationCompat.isGroupSummary(notification)
&& !GROUP_SUMMARY_WHITELIST.contains(source)) { //this could cause #395 to come back
LOG.info("Not forwarding notification, FLAG_GROUP_SUMMARY is set and no wearable action present. Notification flags: " + notification.flags); LOG.info("Not forwarding notification, FLAG_GROUP_SUMMARY is set and no wearable action present. Notification flags: " + notification.flags);
return; return;
} }
@ -400,7 +405,7 @@ public class NotificationListener extends NotificationListenerService {
mNotificationHandleLookup.add(notificationSpec.getId(), sbn.getPostTime()); // for both DISMISS and OPEN mNotificationHandleLookup.add(notificationSpec.getId(), sbn.getPostTime()); // for both DISMISS and OPEN
mPackageLookup.add(notificationSpec.getId(), sbn.getPackageName()); // for MUTE mPackageLookup.add(notificationSpec.getId(), sbn.getPackageName()); // for MUTE
notificationBurstPrevention.put(source, cur_time); notificationBurstPrevention.put(source, curTime);
if(0 != notification.when) { if(0 != notification.when) {
notificationOldRepeatPrevention.put(source, notification.when); notificationOldRepeatPrevention.put(source, notification.when);
}else { }else {