add support for default bridges and VPN mode on

guardianproject · Oct 26, 2022 · 9ed3960 · 9ed3960
1 parent 6cdef5e
commit 9ed3960
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -798,7 +798,8 @@ private void refreshVpnState() {
         if (Prefs.useVpn()) {
             // don't start the Intent, just update Orbot to say that VPN privileges are gone
             if (VpnService.prepare(this) != null) {
-                Prefs.putUseVpn(false);
+               // Prefs.putUseVpn(false);
+                enableVPN(true);
             }
         }
         mBtnVPN.setChecked(Prefs.useVpn());

diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -1029,9 +1029,11 @@ private StringBuffer processSettingsImpl(StringBuffer extraLines) throws IOExcep
                 String[] bridgeListLines = parseBridgesFromSettings(bridgeList);
                 int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length));
                 String bridgeLine = bridgeListLines[bridgeIdx];
-                extraLines.append("Bridge ");
-                extraLines.append(bridgeLine);
-                extraLines.append("\n");
+                if (!TextUtils.isEmpty(bridgeLine)) {
+                    extraLines.append("Bridge ");
+                    extraLines.append(bridgeLine);
+                    extraLines.append("\n");
+                }
             }
         }
 

diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
@@ -2,8 +2,10 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.text.TextUtils;
 
 import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.R;
 
 import java.util.Locale;
 
@@ -29,10 +31,13 @@ public class Prefs {
     private final static String PREF_SNOWFLAKES_SERVED_COUNT = "pref_snowflakes_served";
 
     private static SharedPreferences prefs;
+    private static Context sContext;
 
     public static void setContext(Context context) {
         if (prefs == null)
             prefs = getSharedPrefs(context);
+
+        sContext = context;
     }
 
     private static void putBoolean(String key, boolean value) {
@@ -56,15 +61,17 @@ public static void putHostOnionServicesEnabled(boolean value) {
     }
 
     public static boolean bridgesEnabled() {
-        return prefs.getBoolean(PREF_BRIDGES_ENABLED, false);
+        boolean bridgesEnabled = !TextUtils.isEmpty(getBridgesList());
+        return prefs.getBoolean(PREF_BRIDGES_ENABLED, bridgesEnabled);
     }
 
     public static void putBridgesEnabled(boolean value) {
         putBoolean(PREF_BRIDGES_ENABLED, value);
     }
 
     public static String getBridgesList() {
-        return prefs.getString(PREF_BRIDGES_LIST, "");
+        String defaultBridge = sContext.getString(R.string.default_bridge);
+        return prefs.getString(PREF_BRIDGES_LIST, defaultBridge);
     }
 
     public static void setBridgesList(String value) {
@@ -113,7 +120,7 @@ public static boolean openProxyOnAllInterfaces() {
     }
 
     public static boolean useVpn() {
-        return prefs.getBoolean(PREF_USE_VPN, false);
+        return prefs.getBoolean(PREF_USE_VPN, true);
     }
 
     public static void putUseVpn(boolean value) {

diff --git a/orbotservice/src/main/res/values-fa/strings.xml b/orbotservice/src/main/res/values-fa/strings.xml
@@ -22,4 +22,7 @@
     <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
     <string name="newnym">شما به شناسه جدید تور منتقل شدید</string>
     <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string>
+
+  <string name="default_bridge" translatable="false">snowflake-amp</string>
+
 </resources>
diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml
@@ -24,4 +24,7 @@
     <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string>
   <string name="mebibyte_per_second">MiB/秒</string>
   <string name="kibibyte_per_second">KiB/秒</string>
+
+  <string name="default_bridge" translatable="false">snowflake</string>
+
 </resources>
diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml
@@ -41,5 +41,6 @@
     <string name="log_notice_ignoring_start_request">Ignoring start request, already started.</string>
     <string name="log_notice_geoip_error">There was an error installing geoip files</string>
 
+    <string name="default_bridge" translatable="false"></string>
 </resources>