Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-03-20 15:33:13 +01:00
commit 0ba0259091
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/NotificationHelper.java
View file

@ -6,7 +6,6 @@ import android.support.v4.app.NotificationCompat.Builder;
import net.osmand.plus.notifications.GpsWakeUpNotification; import net.osmand.plus.notifications.GpsWakeUpNotification;
import net.osmand.plus.notifications.GpxNotification; import net.osmand.plus.notifications.GpxNotification;
import net.osmand.plus.notifications.NavigationNotification; import net.osmand.plus.notifications.NavigationNotification;
import net.osmand.plus.notifications.OsMoNotification;
import net.osmand.plus.notifications.OsmandNotification; import net.osmand.plus.notifications.OsmandNotification;
import net.osmand.plus.notifications.OsmandNotification.NotificationType; import net.osmand.plus.notifications.OsmandNotification.NotificationType;
@ -55,8 +54,6 @@ public class NotificationHelper {
notification = gpxNotification; notification = gpxNotification;
} else if (gpsWakeUpNotification.isEnabled()) { } else if (gpsWakeUpNotification.isEnabled()) {
notification = gpsWakeUpNotification; notification = gpsWakeUpNotification;
} else if (osMoNotification.isEnabled() && osMoNotification.isActive()) {
notification = osMoNotification;
} }
return notification; return notification;
} }
@ -75,7 +72,6 @@ public class NotificationHelper {
public void showNotifications() { public void showNotifications() {
boolean navNotificationVisible = navigationNotification.showNotification(); boolean navNotificationVisible = navigationNotification.showNotification();
gpxNotification.showNotification(); gpxNotification.showNotification();
osMoNotification.showNotification();
if (!navNotificationVisible && !gpxNotification.isActive()) { if (!navNotificationVisible && !gpxNotification.isActive()) {
gpsWakeUpNotification.showNotification(); gpsWakeUpNotification.showNotification();
} }
@ -102,7 +98,6 @@ public class NotificationHelper {
public void refreshNotifications() { public void refreshNotifications() {
boolean navNotificationVisible = navigationNotification.refreshNotification(); boolean navNotificationVisible = navigationNotification.refreshNotification();
gpxNotification.refreshNotification(); gpxNotification.refreshNotification();
osMoNotification.refreshNotification();
if (!navNotificationVisible && !gpxNotification.isActive()) { if (!navNotificationVisible && !gpxNotification.isActive()) {
gpsWakeUpNotification.refreshNotification(); gpsWakeUpNotification.refreshNotification();
} else { } else {