commit 877556a94a7bc3cc5a7f45a8a5f268ef588586e6
Author: n8fr8 <nathan(a)guardianproject.info>
Date: Fri Jul 2 14:29:45 2021 -0400
fix conflict
---
.../java/org/torproject/android/service/OrbotService.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 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 2bb89b26..0860bbbf 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -1549,10 +1549,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
startSnowflakeClient();
} else if (Prefs.beSnowflakeProxy()) {
- if (Prefs.limitSnowflakeProxying()
- && isChargingAndWifi(OrbotService.this)) {
- enableSnowflakeProxy();
- } else
+ if (Prefs.limitSnowflakeProxying())
+ {
+ if (isChargingAndWifi(OrbotService.this))
+ {
+ enableSnowflakeProxy();
+ }
+
+ }
+ else
enableSnowflakeProxy();
}