From 6667fc2999b97b498cf6ed5b9d88d913ab00d4c3 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 12 Dec 2022 13:50:52 +0100
Subject: remove some logs

---
 .../java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java    | 4 ----
 .../main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java | 9 +--------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java b/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
index 092635d0..b1c4ca83 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
@@ -78,7 +78,6 @@ public class ClientTransportPlugin implements ClientTransportPluginInterface, Ob
         handler = new Handler(handlerThread.getLooper());
         TorStatusObservable.getInstance().addObserver(this);
         File logfile = new File(context.getApplicationContext().getCacheDir(), "snowflake.log");
-        Log.d(TAG, "logfile at " + logfile.getAbsolutePath());
         try {
             if (logfile.exists()) {
                 logfile.delete();
@@ -99,10 +98,8 @@ public class ClientTransportPlugin implements ClientTransportPluginInterface, Ob
         String target = getCdnFront("snowflake-target");
         String front = getCdnFront("snowflake-front");
         String stunServer = getCdnFront("snowflake-stun");
-        Log.d(TAG, "startSnowflake. target: " + target + ", front:" + front + ", stunServer" + stunServer);
         String ampCache = null;
         if (useAmpCache) {
-            Log.d(TAG, "using ampcache for rendez-vous");
             target = "https://snowflake-broker.torproject.net/";
             ampCache = "https://cdn.ampproject.org/";
             front = "www.google.com";
@@ -230,7 +227,6 @@ public class ClientTransportPlugin implements ClientTransportPluginInterface, Ob
             if (snowflakeStatus == this.snowflakeStatus) {
                 return;
             }
-            Log.d(TAG, "clientTransportPlugin: snowflake status " + this.snowflakeStatus);
             if (snowflakeStatus == RETRY_HTTP_RENDEZVOUS) {
                 handler.post(() -> retryConnectionAttempt(false));
             } else if (snowflakeStatus == RETRY_AMP_CACHE_RENDEZVOUS) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java b/app/src/main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java
index 845d1789..36ab66bf 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tor/TorStatusObservable.java
@@ -149,28 +149,22 @@ public class TorStatusObservable extends Observable {
         //TODO: implement proper state signalling in IPtProxy
         message = message.trim();
         if (SNOWFLAKE_STARTED.equals(message)) {
-            Log.d(TAG, "snowflakeStatus ON");
             getInstance().snowflakeStatus = STARTED;
         } else if (SNOWFLAKE_NEGOTIATING_HTTP.equals(message)) {
-            Log.d(TAG, "snowflake negotiating via http");
             getInstance().snowflakeStatus = NEGOTIATING_RENDEZVOUS_VIA_HTTP;
         } else if (SNOWFLAKE_NEGOTIATING_AMP_CACHE.equals(message)) {
-            Log.d(TAG, "snowflake negotiating via amp cache");
             getInstance().snowflakeStatus = NEGOTIATING_RENDEZVOUS_VIA_AMP_CACHE;
         } else if (SNOWFLAKE_STOPPED_COLLECTING.equals(message) ||
                 SNOWFLAKE_COPY_LOOP_STOPPED.equals(message) ||
                 message.contains(SNOWFLAKE_SOCKS_ERROR)) {
-            Log.d(TAG, "snowflakeStatus OFF");
             getInstance().snowflakeStatus = STOPPED;
         } else if (SNOWFLAKE_CONNECTION_CLOSING.equals(message)) {
-            Log.d(TAG, "snowflake connection closing...");
             if (getInstance().snowflakeStatus == NEGOTIATING_RENDEZVOUS_VIA_HTTP) {
                 if (getInstance().retrySnowflakeRendezVous < 3) {
                     getInstance().retrySnowflakeRendezVous += 1;
                 } else {
                     getInstance().retrySnowflakeRendezVous = 0;
                     getInstance().snowflakeStatus = RETRY_AMP_CACHE_RENDEZVOUS;
-                    Log.d(TAG, "snowflake retry amp cache");
                 }
             } else if (getInstance().snowflakeStatus == NEGOTIATING_RENDEZVOUS_VIA_AMP_CACHE) {
                 if (getInstance().retrySnowflakeRendezVous < 3) {
@@ -178,14 +172,13 @@ public class TorStatusObservable extends Observable {
                 } else {
                     getInstance().retrySnowflakeRendezVous = 0;
                     getInstance().snowflakeStatus = RETRY_HTTP_RENDEZVOUS;
-                    Log.d(TAG, "snowflake retry http domain fronting");
                 }
             }
         } else if (SNOWFLAKE_AMP_CACHE_RESPONSE_200.equals(message) || SNOWFLAKE_HTTP_RESPONSE_200.equals(message)) {
             getInstance().snowflakeStatus = BROKER_REPLIED_SUCCESS;
             getInstance().retrySnowflakeRendezVous = 0;
-            Log.d(TAG, "snowflake broker replied success");
         }
+        Log.d(TAG, "snowflake status " + getInstance().snowflakeStatus);
         instance.setChanged();
         instance.notifyObservers();
     }
-- 
cgit v1.2.3