summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-06-04 20:15:12 +0200
committerParménides GV <parmegv@sdf.org>2016-04-02 11:41:30 +0200
commit2ae1824801e47def4fb78008c9fb3fb2e5e89e68 (patch)
treee9e835a76a29b131fdea30074b552a2a46fd32a0
parenta50b5921c035780e29256216baa6f1f03d923c08 (diff)
Don't show two notifications
-rw-r--r--main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index b778f4c9..291bedfe 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -185,7 +185,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
mNotificationManager.notify(OPENVPN_STATUS, notification);
- startForeground(OPENVPN_STATUS, notification);
+ // startForeground(OPENVPN_STATUS, notification);
// Check if running on a TV
if (runningOnAndroidTV() && !lowpriority)
@@ -937,6 +937,10 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
mConnecttime = System.currentTimeMillis();
if (!runningOnAndroidTV())
lowpriority = true;
+
+ String ns = Context.NOTIFICATION_SERVICE;
+ NotificationManager mNotificationManager = (NotificationManager) getSystemService(ns);
+ mNotificationManager.cancel(OPENVPN_STATUS);
} else {
mDisplayBytecount = false;
}
@@ -946,8 +950,8 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
// CONNECTED
// Does not work :(
String msg = getString(resid);
- showNotification(VpnStatus.getLastCleanLogMessage(this),
- msg, lowpriority, 0, level);
+ // showNotification(VpnStatus.getLastCleanLogMessage(this),
+ // msg, lowpriority, 0, level);
}
}
@@ -970,7 +974,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
humanReadableByteCount(diffOut / OpenVPNManagement.mBytecountInterval, true));
boolean lowpriority = !mNotificationAlwaysVisible;
- showNotification(netstat, null, lowpriority, mConnecttime, LEVEL_CONNECTED);
+ //showNotification(netstat, null, lowpriority, mConnecttime, LEVEL_CONNECTED);
}
}