From e54c7a5407da82feb6dc6fb0de5e2d9f3756b651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 24 Mar 2015 19:29:55 +0100 Subject: 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. --- .../java/se/leap/bitmaskclient/ProviderAPI.java | 9 +- .../main/java/se/leap/bitmaskclient/Dashboard.java | 1 - .../java/se/leap/bitmaskclient/EipFragment.java | 7 -- .../java/se/leap/bitmaskclient/OnBootReceiver.java | 3 - .../java/se/leap/bitmaskclient/eip/EipStatus.java | 3 - .../java/se/leap/bitmaskclient/eip/Gateway.java | 4 - .../se/leap/bitmaskclient/eip/GatewaysManager.java | 4 +- .../se/leap/bitmaskclient/eip/VoidVpnService.java | 5 +- .../bitmaskclient/eip/VpnCertificateValidator.java | 4 - .../java/se/leap/bitmaskclient/ProviderAPI.java | 9 +- .../se/leap/bitmaskclient/ProviderListContent.java | 135 +++++++-------------- 11 files changed, 51 insertions(+), 133 deletions(-) diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java index 50d09c55..0b24e1c9 100644 --- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java +++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java @@ -93,8 +93,7 @@ public class ProviderAPI extends IntentService { } public ProviderAPI() { - super("ProviderAPI"); - Log.v("ClassName", "Provider API"); + super(TAG); } @Override @@ -403,8 +402,6 @@ public class ProviderAPI extends IntentService { parameters.put("user[login]", username); parameters.put("user[password_salt]", salt); parameters.put("user[password_verifier]", password_verifier); - Log.d(TAG, server_url); - Log.d(TAG, parameters.toString()); return sendToServer(server_url + "/users.json", "POST", parameters); } @@ -465,11 +462,9 @@ public class ProviderAPI extends IntentService { InputStream error_stream = urlConnection.getErrorStream(); if (error_stream != null) { String error_response = new Scanner(error_stream).useDelimiter("\\A").next(); - Log.d("Error", error_response); try { error_message = new JSONObject(error_response); } catch (JSONException e) { - Log.d(TAG, e.getMessage()); e.printStackTrace(); } urlConnection.disconnect(); @@ -870,7 +865,6 @@ public class ProviderAPI extends IntentService { responseCode = urlConnection.getResponseCode(); broadcastProgress(progress++); LeapSRPSession.setToken(""); - Log.d(TAG, Integer.toString(responseCode)); } catch (ClientProtocolException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -887,7 +881,6 @@ public class ProviderAPI extends IntentService { if (responseCode == 401) { broadcastProgress(progress++); LeapSRPSession.setToken(""); - Log.d(TAG, Integer.toString(responseCode)); return true; } } 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(); diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java index e4b95567..7cf80a4f 100644 --- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java +++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java @@ -92,8 +92,7 @@ public class ProviderAPI extends IntentService { } public ProviderAPI() { - super("ProviderAPI"); - Log.v("ClassName", "Provider API"); + super(TAG); } @Override @@ -397,8 +396,6 @@ public class ProviderAPI extends IntentService { parameters.put("user[login]", username); parameters.put("user[password_salt]", salt); parameters.put("user[password_verifier]", password_verifier); - Log.d(TAG, server_url); - Log.d(TAG, parameters.toString()); return sendToServer(server_url + "/users.json", "POST", parameters); } @@ -459,11 +456,9 @@ public class ProviderAPI extends IntentService { InputStream error_stream = urlConnection.getErrorStream(); if (error_stream != null) { String error_response = new Scanner(error_stream).useDelimiter("\\A").next(); - Log.d("Error", error_response); try { error_message = new JSONObject(error_response); } catch (JSONException e) { - Log.d(TAG, e.getMessage()); e.printStackTrace(); } urlConnection.disconnect(); @@ -854,7 +849,6 @@ public class ProviderAPI extends IntentService { responseCode = urlConnection.getResponseCode(); broadcastProgress(progress++); LeapSRPSession.setToken(""); - Log.d(TAG, Integer.toString(responseCode)); } catch (ClientProtocolException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -871,7 +865,6 @@ public class ProviderAPI extends IntentService { if (responseCode == 401) { broadcastProgress(progress++); LeapSRPSession.setToken(""); - Log.d(TAG, Integer.toString(responseCode)); return true; } } diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java b/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java index b604ce09..235ae5ab 100644 --- a/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java +++ b/app/src/release/java/se/leap/bitmaskclient/ProviderListContent.java @@ -1,6 +1,7 @@ /** * Copyright (c) 2013 LEAP Encryption Access Project and contributers - * * This program is free software: you can redistribute it and/or modify + * + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. @@ -13,11 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -ackage se.leap.bitmaskclient; +package se.leap.bitmaskclient; - import java.io.*; - import java.util.*; - import java.net.*; +import java.util.*; +import java.net.*; /** * Models the provider list shown in the ConfigurationWizard. @@ -26,97 +26,56 @@ ackage se.leap.bitmaskclient; */ public class ProviderListContent { - p blic - static List ITEMS = new ArrayList(); - - p blic - static Map ITEM_MAP = new HashMap(); + public static List ITEMS = new ArrayList(); - / * - * - Adds a - new - provider item - to the - end of - the items - map, - and to - the items - list. - * - * - @param - item - / - p blic + public static Map ITEM_MAP = new HashMap(); - static void addItem(ProviderItem item) { - EMS.add(item); - EM_MAP.put(String.valueOf(ITEMS.size()), item); + /** + * Adds a new provider item to the end of the items map, and to the items list. + * + * @param item + */ + public static void addItem(ProviderItem item) { + ITEMS.add(item); + ITEM_MAP.put(String.valueOf(ITEMS.size()), item); } - p - blic - - static void removeItem(ProviderItem item) { - EMS.remove(item); - EM_MAP.remove(item); + public static void removeItem(ProviderItem item) { + ITEMS.remove(item); + ITEM_MAP.remove(item); } - / * - * - A provider - item. - / - p blic - - static class ProviderItem { - nal - public static String CUSTOM = "custom"; - ivate String - provider_main_url; - ivate String - name; - - * - * - @param - name of - the provider - * - @param - provider_main_url used - to download - provider.json file - of the - provider - / - - blic ProviderItem(String name, String provider_main_url) { - is.name = name; - is.provider_main_url = provider_main_url; - - - ic String name() { - ret - urn name; - } - + /** + * A provider item. + */ + public static class ProviderItem { + final public static String CUSTOM = "custom"; + private String provider_main_url; + private String name; + + /** + * @param name of the provider + * @param provider_main_url used to download provider.json file of the provider + */ + public ProviderItem(String name, String provider_main_url) { + this.name = name; + this.provider_main_url = provider_main_url; + } - p - String providerMainUrl () { - retur - n provider_main_url; - } + public String name() { + return name; + } + public String providerMainUrl() { + return provider_main_url; + } - pub - tring domain () { - try { - retu ew URL(provider_main_url).getHost(); - } cat(MalformedURLException e) { - retu rovider_main_url.replaceFirst("http[s]?://", "").replaceFirst("/.*", ""); - } + public String domain() { + try { + return new URL(provider_main_url).getHost(); + } catch (MalformedURLException e) { + return provider_main_url.replaceFirst("http[s]?://", "").replaceFirst("/.*", ""); } } + } +} -- cgit v1.2.3