[tor-commits] [orbot/master] Snowflake animations had a bug; they'd appear if tor connects and the pref is set to true even if proxy wasn't enabled (because bridges were...)

[n8fr8@xxxxxxxxxxxxxx]

commit 843effd93e5f513bc83ef8a1baf9b7e7be5e4a8c
Author: b <dsnake@xxxxxxxxxxxxxx>
Date:   Wed Dec 15 16:50:35 2021 -0500

    Snowflake animations had a bug; they'd appear if tor connects and the pref is set to true even if proxy wasn't enabled (because bridges were...)
---
 orbotservice/src/main/assets/fronts                                      | 1 +
 .../src/main/java/org/torproject/android/service/util/Prefs.java         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/orbotservice/src/main/assets/fronts b/orbotservice/src/main/assets/fronts
index 6cafa57b..3900c33a 100644
--- a/orbotservice/src/main/assets/fronts
+++ b/orbotservice/src/main/assets/fronts
@@ -1,6 +1,7 @@
 snowflake-target https://snowflake-broker.torproject.net.global.prod.fastly.net/
 snowflake-front cdn.sstatic.net
 snowflake-stun stun:stun.stunprotocol.org:3478
+snowflake-ampcache https://cdn.ampproject.org/
 moat-cdn https://d50gd378qj74g.cloudfront.net/
 moat-url https://moat.torproject.org.global.prod.fastly.net/
 moat-front cdn.sstatic.net
\ No newline at end of file
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
index d12cc6a6..78ef2d81 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
@@ -76,6 +76,7 @@ public class Prefs {
     }
 
     public static boolean beSnowflakeProxy () {
+        if (Prefs.bridgesEnabled()) return false;
         return prefs.getBoolean(PREF_BE_A_SNOWFLAKE,false);
     }
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits