Remove all Logs.

In the near future, I should implement an error feedback
mechanism (ideally using ics-openvpn's log view), and avoid the
e.printStackTrace() and Log.d("","") without losing information.

8 files changed, 2 insertions, 29 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 2e9aa74c..ee64a1b3 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -421,7 +421,6 @@ public class Dashboard extends Activity implements SessionDialog.SessionDialogIn
 
     @Override
     public void onReceiveResult(int resultCode, Bundle resultData) {
-        Log.d(TAG, "onReceiveResult");
         if (resultCode == ProviderAPI.SUCCESSFUL_SIGNUP) {
             String username = resultData.getString(SessionDialog.USERNAME);
             String password = resultData.getString(SessionDialog.PASSWORD);
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 3ad658f5..02eedd77 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -76,8 +76,6 @@ public class EipFragment extends Fragment implements Observer {
         if (eip_status.isConnecting())
             eip_switch.setVisibility(View.VISIBLE);
 
-        Log.d(TAG, "onCreateView, eip_switch is checked? " + eip_switch.isChecked());
-
         Bundle arguments = getArguments();
         if (arguments != null && arguments.containsKey(START_ON_BOOT) && arguments.getBoolean(START_ON_BOOT))
             startEipFromScratch();
@@ -149,8 +147,6 @@ public class EipFragment extends Fragment implements Observer {
     private boolean canLogInToStartEIP() {
         boolean isAllowedRegistered = Dashboard.preferences.getBoolean(Constants.ALLOWED_REGISTERED, false);
         boolean isLoggedIn = !LeapSRPSession.getToken().isEmpty();
-        Log.d(TAG, "Allow registered? " + isAllowedRegistered);
-        Log.d(TAG, "Is logged in? " + isLoggedIn);
         return isAllowedRegistered && !isLoggedIn && !eip_status.isConnecting() && !eip_status.isConnected();
     }
 
@@ -283,7 +279,6 @@ public class EipFragment extends Fragment implements Observer {
 
     private void setConnectedUI() {
         hideProgressBar();
-        Log.d(TAG, "setConnectedUi? " + eip_status.isConnected());
         adjustSwitch();
         is_starting_to_connect = false;
         status_message.setText(dashboard.getString(R.string.eip_state_connected));
@@ -302,12 +297,10 @@ public class EipFragment extends Fragment implements Observer {
 
     private void adjustSwitch() {
         if (eip_status.isConnected() || eip_status.isConnecting() || is_starting_to_connect) {
-            Log.d(TAG, "adjustSwitch, isConnected || isConnecting, is checked");
             if (!eip_switch.isChecked()) {
                 eip_switch.setChecked(true);
             }
         } else {
-            Log.d(TAG, "adjustSwitch, !isConnected && !isConnecting? " + eip_status.toString());
 
             if (eip_switch.isChecked()) {
                 eip_switch.setChecked(false);
diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
index 073d727f..9171e816 100644
--- a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
@@ -1,7 +1,6 @@
 package se.leap.bitmaskclient;
 
 import android.content.*;
-import android.util.*;
 
 import se.leap.bitmaskclient.eip.*;
 
@@ -15,8 +14,6 @@ public class OnBootReceiver extends BroadcastReceiver {
         preferences = context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE);
         boolean provider_configured = !preferences.getString(Provider.KEY, "").isEmpty();
         boolean start_on_boot = preferences.getBoolean(Dashboard.START_ON_BOOT, false);
-        Log.d("OnBootReceiver", "Provider configured " + String.valueOf(provider_configured));
-        Log.d("OnBootReceiver", "Start on boot " + String.valueOf(start_on_boot));
         if (provider_configured && start_on_boot) {
             Intent dashboard_intent = new Intent(context, Dashboard.class);
             dashboard_intent.setAction(Constants.ACTION_START_EIP);
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
index e636c693..ad68f96e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
@@ -16,7 +16,6 @@
  */
 package se.leap.bitmaskclient.eip;
 
-import android.util.*;
 import android.content.*;
 
 import java.util.*;
@@ -51,7 +50,6 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
             setConnectedOrDisconnected();
         } else if (isConnecting())
             setConnecting();
-        Log.d(TAG, "update state with level " + level);
     }
 
     private void updateStatus(final String state, final String logmessage, final int localizedResId, final VpnStatus.ConnectionStatus level) {
@@ -93,7 +91,6 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
     }
 
     public void setConnectedOrDisconnected() {
-        Log.d(TAG, "setConnectedOrDisconnected()");
         wants_to_disconnect = false;
         current_status.setChanged();
         current_status.notifyObservers();
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java b/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
index b2c7af8c..ff7d011e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java
@@ -16,8 +16,6 @@
  */
 package se.leap.bitmaskclient.eip;
 
-import android.util.*;
-
 import com.google.gson.*;
 
 import org.json.*;
@@ -106,12 +104,10 @@ public class Gateway {
             return cp.convertProfile();
         } catch (ConfigParser.ConfigParseError e) {
             // FIXME We didn't get a VpnProfile!  Error handling! and log level
-            Log.v(TAG, "Error creating VPNProfile");
             e.printStackTrace();
             return null;
         } catch (IOException e) {
             // FIXME We didn't get a VpnProfile!  Error handling! and log level
-            Log.v(TAG, "Error creating VPNProfile");
             e.printStackTrace();
             return null;
         }
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
index b41fcfd4..1c64328e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/GatewaysManager.java
@@ -17,7 +17,6 @@
 package se.leap.bitmaskclient.eip;
 
 import android.content.*;
-import android.util.*;
 
 import com.google.gson.*;
 import com.google.gson.reflect.*;
@@ -77,8 +76,7 @@ public class GatewaysManager {
             for (Gateway gateway : gateways_list)
                 addGateway(gateway);
             this.gateways.addAll(gateways_list);
-        } else
-            Log.d("GatewaysManager", "No gateways added");
+        }
     }
 
     @Override
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
index ac3d5d77..dac92fe2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VoidVpnService.java
@@ -31,7 +31,6 @@ public class VoidVpnService extends VpnService {
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-                    android.util.Log.d(TAG, "VoidVpnService set up: fd = " + fd.toString());
                 }
             });
             thread.run();
@@ -53,10 +52,8 @@ public class VoidVpnService extends VpnService {
 
     private static void closeFd() {
         try {
-            if (fd != null) {
-                android.util.Log.d(TAG, "VoidVpnService closing fd = " + fd.toString());
+            if (fd != null)
                 fd.close();
-            }
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
index 025d049d..8fce6a37 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
@@ -16,8 +16,6 @@
  */
 package se.leap.bitmaskclient.eip;
 
-import android.util.*;
-
 import java.security.cert.*;
 import java.util.*;
 
@@ -42,7 +40,6 @@ public class VpnCertificateValidator {
     private boolean isValid(X509Certificate certificate) {
         Calendar offset_date = calculateOffsetCertificateValidity(certificate);
         try {
-            Log.d(TAG, "offset_date = " + offset_date.getTime().toString());
             certificate.checkValidity(offset_date.getTime());
             return true;
         } catch (CertificateExpiredException e) {
@@ -53,7 +50,6 @@ public class VpnCertificateValidator {
     }
 
     private Calendar calculateOffsetCertificateValidity(X509Certificate certificate) {
-        Log.d(TAG, "certificate not after = " + certificate.getNotAfter());
         long preventive_time = Math.abs(certificate.getNotBefore().getTime() - certificate.getNotAfter().getTime()) / 2;
         long current_date_millis = Calendar.getInstance().getTimeInMillis();