Merge branch 'master' of github.com:guardianproject/orbot

guardianproject · Dec 22, 2021 · 5a1e7a9 · 5a1e7a9
2 parents c208274 + f1f4750
commit 5a1e7a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.../main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java b/.../main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java
@@ -34,7 +34,9 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
     private void doDelete(Bundle arguments, Context context) {
         context.getContentResolver().delete(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.OnionService._ID + '=' + arguments.getInt(OnionServiceActivity.BUNDLE_KEY_ID), null);
         String base = context.getFilesDir().getAbsolutePath() + "/" + TorServiceConstants.ONION_SERVICES_DIR;
-        DiskUtils.recursivelyDeleteDirectory(new File(base, arguments.getString(OnionServiceActivity.BUNDLE_KEY_PATH)));
+        String localPath = arguments.getString(OnionServiceActivity.BUNDLE_KEY_PATH);
+        if (localPath != null)
+            DiskUtils.recursivelyDeleteDirectory(new File(base, localPath));
     }
 
 }
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -138,7 +138,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");
     }
 
@@ -243,7 +242,8 @@ protected void showToolbarNotification(String notifyMsg, int notifyType, int ico
     }
 
     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));