commit 5792d666ff2ddd3da9200a15f27b24af66e22006
Author: b <[email protected]>
Date: Tue Dec 21 18:18:25 2021 -0500
Fixes #398 empty notification
---
.../src/main/java/org/torproject/android/service/OrbotService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 5fd05409..222bf6f5 100644
---
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -139,7 +139,6 @@ public class OrbotService extends VpnService implements
TorServiceConstants, Orb
private static String[] parseBridgesFromSettings(String bridgeList) {
// this regex replaces lines that only contain whitespace with an
empty String
bridgeList = bridgeList.trim().replaceAll("(?m)^[ \t]*\r?\n", "");
- Log.d("bim", "bridgeList=" + bridgeList);
return bridgeList.split("\\n");
}
@@ -244,7 +243,8 @@ public class OrbotService extends VpnService implements
TorServiceConstants, Orb
}
public int onStartCommand(Intent intent, int flags, int startId) {
- showToolbarNotification("", NOTIFY_ID, R.drawable.ic_stat_tor);
+ if (!mNotificationShowing)
+ showToolbarNotification(getString(R.string.status_disabled),
NOTIFY_ID, R.drawable.ic_stat_tor);
if (intent != null)
mExecutor.execute(new IncomingIntentRouter(intent));
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
