From 59f7679c633284d772a91a9ee057034a8223e73a Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sun, 29 Dec 2019 23:09:04 +0100 Subject: remove a outdated armeabi target for shapeshifter lib cross compiling --- go/android_build_shapeshifter.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/android_build_shapeshifter.sh b/go/android_build_shapeshifter.sh index 7a884689..e39f9eb1 100755 --- a/go/android_build_shapeshifter.sh +++ b/go/android_build_shapeshifter.sh @@ -71,7 +71,7 @@ else # To remove targets, simply delete them from the bracket. # NOTE: We are only currently shipping the armeabi-v7a binary # on Android, for space reasons. - targets=(386 amd64 armv5 armv7 arm64) + targets=(386 x86_64 armv7 arm64) export GOOS=android for arch in ${targets[@]}; do @@ -86,7 +86,7 @@ else ndk_arch="x86" suffix="x86" binary="i686-linux-android-gcc" - elif [ "$arch" = "amd64" ]; then + elif [ "$arch" = "x86_64" ]; then ndk_platform="android-21" ndk_arch="x86_64" suffix="x86_64" -- cgit v1.2.3 From 22eb43939a8bcae2ed7f89d37abf023fc33c485f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Dec 2019 07:09:31 +0100 Subject: initial firewall implementation to fix #8939 --- .../de/blinkt/openvpn/core/OpenVPNService.java | 6 + .../main/java/se/leap/bitmaskclient/utils/Cmd.java | 93 ++++++++++++ .../leap/bitmaskclient/utils/FirewallHelper.java | 167 +++++++++++++++++++++ 3 files changed, 266 insertions(+) create mode 100644 app/src/main/java/se/leap/bitmaskclient/utils/Cmd.java create mode 100644 app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index 0863cc8e..724fd0fd 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -47,6 +47,7 @@ import de.blinkt.openvpn.core.connection.Obfs4Connection; import se.leap.bitmaskclient.R; import se.leap.bitmaskclient.VpnNotificationManager; import se.leap.bitmaskclient.pluggableTransports.Shapeshifter; +import se.leap.bitmaskclient.utils.FirewallHelper; import static de.blinkt.openvpn.core.ConnectionStatus.LEVEL_CONNECTED; import static de.blinkt.openvpn.core.ConnectionStatus.LEVEL_WAITING_FOR_USER_INPUT; @@ -89,6 +90,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac private Runnable mOpenVPNThread; private VpnNotificationManager notificationManager; private Shapeshifter shapeshifter; + private FirewallHelper firewallHelper; private static final int PRIORITY_MIN = -2; private static final int PRIORITY_DEFAULT = 0; @@ -192,6 +194,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac VpnStatus.removeStateListener(this); } } + firewallHelper.shutdownFirewall(); } private boolean runningOnAndroidTV() { @@ -446,6 +449,8 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac mProcessThread.start(); } + firewallHelper.startFirewall(); + new Handler(getMainLooper()).post(() -> { if (mDeviceStateReceiver != null) { unregisterDeviceStateReceiver(); @@ -513,6 +518,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac super.onCreate(); notificationManager = new VpnNotificationManager(this, this); notificationManager.createOpenVpnNotificationChannel(); + firewallHelper = new FirewallHelper(); } @Override diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/Cmd.java b/app/src/main/java/se/leap/bitmaskclient/utils/Cmd.java new file mode 100644 index 00000000..a72658a4 --- /dev/null +++ b/app/src/main/java/se/leap/bitmaskclient/utils/Cmd.java @@ -0,0 +1,93 @@ +/** + * Copyright (c) 2019 LEAP Encryption Access Project and contributers + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package se.leap.bitmaskclient.utils; + +import android.support.annotation.WorkerThread; +import android.util.Log; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; + +public class Cmd { + + private static final String TAG = Cmd.class.getSimpleName(); + + @WorkerThread + public static int runBlockingCmd(String[] cmds, StringBuilder log) throws Exception { + return runCmd(cmds, log, true); + } + + @WorkerThread + private static int runCmd(String[] cmds, StringBuilder log, + boolean waitFor) throws Exception { + + int exitCode = -1; + Process proc = Runtime.getRuntime().exec("sh"); + OutputStreamWriter out = new OutputStreamWriter(proc.getOutputStream()); + + try { + for (String cmd : cmds) { + Log.d(TAG, "executing CMD: " + cmd); + out.write(cmd); + out.write("\n"); + } + + out.flush(); + out.write("exit\n"); + out.flush(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + out.close(); + } + + if (waitFor) { + // Consume the "stdout" + InputStreamReader reader = new InputStreamReader(proc.getInputStream()); + readToLogString(reader, log); + + // Consume the "stderr" + reader = new InputStreamReader(proc.getErrorStream()); + readToLogString(reader, log); + + try { + exitCode = proc.waitFor(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + return exitCode; + } + + private static void readToLogString(InputStreamReader reader, StringBuilder log) throws IOException { + final char buf[] = new char[10]; + int read = 0; + try { + while ((read = reader.read(buf)) != -1) { + if (log != null) + log.append(buf, 0, read); + } + } catch (IOException e) { + reader.close(); + throw new IOException(e); + } + reader.close(); + } +} diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java new file mode 100644 index 00000000..43a5296f --- /dev/null +++ b/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java @@ -0,0 +1,167 @@ +package se.leap.bitmaskclient.utils; +/** + * Copyright (c) 2019 LEAP Encryption Access Project and contributers + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import android.os.AsyncTask; +import android.text.TextUtils; +import android.util.Log; + +import java.lang.ref.WeakReference; + +import static se.leap.bitmaskclient.utils.Cmd.runBlockingCmd; + +interface FirewallCallback { + void onFirewallStarted(boolean success); + void onFirewallStopped(boolean success); +} + + +public class FirewallHelper implements FirewallCallback { + private static String BITMASK_CHAIN = "bitmask_fw"; + private static final String TAG = FirewallHelper.class.getSimpleName(); + + + @Override + public void onFirewallStarted(boolean success) { + Log.d(TAG, "Firewall started " + success); + } + + @Override + public void onFirewallStopped(boolean success) { + Log.d(TAG, "Firewall stopped " + success); + } + + + static class StartFirewallTask extends AsyncTask { + + WeakReference callbackWeakReference; + + public StartFirewallTask(FirewallCallback callback) { + callbackWeakReference = new WeakReference<>(callback); + } + + @Override + protected Boolean doInBackground(Void... voids) { + if (requestSU()) { + Log.d(TAG, "su acquired"); + StringBuilder log = new StringBuilder(); + String[] bitmaskChain = new String[]{ + "su", + "ip6tables --list " + BITMASK_CHAIN }; + try { + boolean hasBitmaskChain = runBlockingCmd(bitmaskChain, log) == 0; + Log.d(TAG, log.toString()); + if (!hasBitmaskChain) { + String[] createChain = new String[]{ + "su", + "ip6tables --new-chain " + BITMASK_CHAIN, + "ip6tables --insert OUTPUT --jump " + BITMASK_CHAIN }; + log = new StringBuilder(); + int success = runBlockingCmd(createChain, log); + Log.d(TAG, "added " + BITMASK_CHAIN + " to ip6tables: " + success); + Log.d(TAG, log.toString()); + if (success != 0) { + return false; + } + } + + log = new StringBuilder(); + String[] addRules = new String[] { + "su", + "ip6tables --append " + BITMASK_CHAIN + " -p tcp --jump REJECT", + "ip6tables --append " + BITMASK_CHAIN + " -p udp --jump REJECT" }; + boolean successResult = runBlockingCmd(addRules, log) == 0; + Log.d(TAG, log.toString()); + return successResult; + } catch (Exception e) { + e.printStackTrace(); + Log.e(TAG, log.toString()); + } + }; + return false; + } + + @Override + protected void onPostExecute(Boolean result) { + super.onPostExecute(result); + FirewallCallback callback = callbackWeakReference.get(); + if (callback != null) { + callback.onFirewallStarted(result); + } + } + } + + static class ShutdownFirewallTask extends AsyncTask { + + @Override + protected Boolean doInBackground(Void... voids) { + + if (requestSU()) { + StringBuilder log = new StringBuilder(); + String[] deleteChain = new String[]{ + "su", + "ip6tables --delete OUTPUT --jump " + BITMASK_CHAIN, + "ip6tables --flush " + BITMASK_CHAIN, + "ip6tables --delete-chain " + BITMASK_CHAIN + }; + try { + runBlockingCmd(deleteChain, log); + } catch (Exception e) { + e.printStackTrace(); + Log.e(TAG, log.toString()); + } + + } + + return null; + } + } + + + public void startFirewall() { + StartFirewallTask task = new StartFirewallTask(this); + task.execute(); + } + + public void shutdownFirewall() { + ShutdownFirewallTask task = new ShutdownFirewallTask(); + task.execute(); + } + + public static boolean hasSU() { + StringBuilder log = new StringBuilder(); + + try { + String suCommand = "su -v"; + runBlockingCmd(new String[]{suCommand}, log); + } catch (Exception e) { + return false; + } + + return !TextUtils.isEmpty(log) && !log.toString().contains("su: not found"); + } + + public static boolean requestSU() { + try { + String suCommand = "su"; + return runBlockingCmd(new String[]{suCommand}, null) == 0; + } catch (Exception e) { + return false; + } + } + +} -- cgit v1.2.3 From 988bd203ee14a589eef58a4aa6bd51a5b005d072 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Dec 2019 17:16:14 +0100 Subject: reduce su calls, add logging, save if su exists and was allowed to preferences --- .../de/blinkt/openvpn/core/OpenVPNService.java | 2 +- .../main/java/se/leap/bitmaskclient/Constants.java | 1 + .../leap/bitmaskclient/utils/FirewallHelper.java | 177 ++++++++++++--------- .../leap/bitmaskclient/utils/PreferenceHelper.java | 29 +++- 4 files changed, 133 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index 724fd0fd..766dc925 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -518,7 +518,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac super.onCreate(); notificationManager = new VpnNotificationManager(this, this); notificationManager.createOpenVpnNotificationChannel(); - firewallHelper = new FirewallHelper(); + firewallHelper = new FirewallHelper(this); } @Override diff --git a/app/src/main/java/se/leap/bitmaskclient/Constants.java b/app/src/main/java/se/leap/bitmaskclient/Constants.java index d3c09f08..0cbf82e1 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Constants.java +++ b/app/src/main/java/se/leap/bitmaskclient/Constants.java @@ -15,6 +15,7 @@ public interface Constants { String LAST_USED_PROFILE = "last_used_profile"; String EXCLUDED_APPS = "excluded_apps"; String USE_PLUGGABLE_TRANSPORTS = "usePluggableTransports"; + String SU_PERMISSION = "su_permission"; ////////////////////////////////////////////// diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java index 43a5296f..8b80f1f0 100644 --- a/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java @@ -16,17 +16,20 @@ package se.leap.bitmaskclient.utils; * along with this program. If not, see . */ +import android.content.Context; import android.os.AsyncTask; -import android.text.TextUtils; import android.util.Log; import java.lang.ref.WeakReference; +import de.blinkt.openvpn.core.VpnStatus; + import static se.leap.bitmaskclient.utils.Cmd.runBlockingCmd; interface FirewallCallback { void onFirewallStarted(boolean success); void onFirewallStopped(boolean success); + void onSuRequested(boolean success); } @@ -34,64 +37,92 @@ public class FirewallHelper implements FirewallCallback { private static String BITMASK_CHAIN = "bitmask_fw"; private static final String TAG = FirewallHelper.class.getSimpleName(); + private Context context; + + public FirewallHelper(Context context) { + this.context = context; + } + @Override public void onFirewallStarted(boolean success) { - Log.d(TAG, "Firewall started " + success); + if (success) { + VpnStatus.logInfo("[FIREWALL] custom rules established"); + } else { + VpnStatus.logError("[FIREWALL] could not establish custom rules."); + } } @Override public void onFirewallStopped(boolean success) { - Log.d(TAG, "Firewall stopped " + success); + if (success) { + VpnStatus.logInfo("[FIREWALL] custom rules deleted"); + } else { + VpnStatus.logError("[FIREWALL] could not delete custom rules"); + } } + @Override + public void onSuRequested(boolean success) { + PreferenceHelper.setSuPermission(context, success); + if (!success) { + VpnStatus.logError("[FIREWALL] Bitmask needs root permission to execute custom firewall rules."); + } + } - static class StartFirewallTask extends AsyncTask { + + private static class StartFirewallTask extends AsyncTask { WeakReference callbackWeakReference; - public StartFirewallTask(FirewallCallback callback) { + StartFirewallTask(FirewallCallback callback) { callbackWeakReference = new WeakReference<>(callback); } @Override protected Boolean doInBackground(Void... voids) { - if (requestSU()) { - Log.d(TAG, "su acquired"); - StringBuilder log = new StringBuilder(); - String[] bitmaskChain = new String[]{ - "su", - "ip6tables --list " + BITMASK_CHAIN }; + StringBuilder log = new StringBuilder(); + String[] bitmaskChain = new String[]{ + "su", + "id", + "ip6tables --list " + BITMASK_CHAIN }; + + + try { + boolean hasBitmaskChain = runBlockingCmd(bitmaskChain, log) == 0; + boolean allowSu = log.toString().contains("uid=0"); try { - boolean hasBitmaskChain = runBlockingCmd(bitmaskChain, log) == 0; + callbackWeakReference.get().onSuRequested(allowSu); + Thread.sleep(1000); + } catch (Exception e) { + //ignore + } + + boolean success; + log = new StringBuilder(); + if (!hasBitmaskChain) { + String[] createChainAndRules = new String[]{ + "su", + "ip6tables --new-chain " + BITMASK_CHAIN, + "ip6tables --insert OUTPUT --jump " + BITMASK_CHAIN, + "ip6tables --append " + BITMASK_CHAIN + " -p tcp --jump REJECT", + "ip6tables --append " + BITMASK_CHAIN + " -p udp --jump REJECT" + }; + success = runBlockingCmd(createChainAndRules, log) == 0; + Log.d(TAG, "added " + BITMASK_CHAIN + " to ip6tables: " + success); Log.d(TAG, log.toString()); - if (!hasBitmaskChain) { - String[] createChain = new String[]{ - "su", - "ip6tables --new-chain " + BITMASK_CHAIN, - "ip6tables --insert OUTPUT --jump " + BITMASK_CHAIN }; - log = new StringBuilder(); - int success = runBlockingCmd(createChain, log); - Log.d(TAG, "added " + BITMASK_CHAIN + " to ip6tables: " + success); - Log.d(TAG, log.toString()); - if (success != 0) { - return false; - } - } - - log = new StringBuilder(); + return success; + } else { String[] addRules = new String[] { "su", "ip6tables --append " + BITMASK_CHAIN + " -p tcp --jump REJECT", "ip6tables --append " + BITMASK_CHAIN + " -p udp --jump REJECT" }; - boolean successResult = runBlockingCmd(addRules, log) == 0; - Log.d(TAG, log.toString()); - return successResult; - } catch (Exception e) { - e.printStackTrace(); - Log.e(TAG, log.toString()); + return runBlockingCmd(addRules, log) == 0; } - }; + } catch (Exception e) { + e.printStackTrace(); + Log.e(TAG, log.toString()); + } return false; } @@ -105,29 +136,49 @@ public class FirewallHelper implements FirewallCallback { } } - static class ShutdownFirewallTask extends AsyncTask { + private static class ShutdownFirewallTask extends AsyncTask { + + WeakReference callbackWeakReference; + + ShutdownFirewallTask(FirewallCallback callback) { + callbackWeakReference = new WeakReference<>(callback); + } @Override protected Boolean doInBackground(Void... voids) { + boolean success; + StringBuilder log = new StringBuilder(); + String[] deleteChain = new String[]{ + "su", + "id", + "ip6tables --delete OUTPUT --jump " + BITMASK_CHAIN, + "ip6tables --flush " + BITMASK_CHAIN, + "ip6tables --delete-chain " + BITMASK_CHAIN + }; + try { + success = runBlockingCmd(deleteChain, log) == 0; + } catch (Exception e) { + e.printStackTrace(); + Log.e(TAG, log.toString()); + return false; + } - if (requestSU()) { - StringBuilder log = new StringBuilder(); - String[] deleteChain = new String[]{ - "su", - "ip6tables --delete OUTPUT --jump " + BITMASK_CHAIN, - "ip6tables --flush " + BITMASK_CHAIN, - "ip6tables --delete-chain " + BITMASK_CHAIN - }; - try { - runBlockingCmd(deleteChain, log); - } catch (Exception e) { - e.printStackTrace(); - Log.e(TAG, log.toString()); - } - + try { + boolean allowSu = log.toString().contains("uid=0"); + callbackWeakReference.get().onSuRequested(allowSu); + } catch (Exception e) { + //ignore } + return success; + } - return null; + @Override + protected void onPostExecute(Boolean result) { + super.onPostExecute(result); + FirewallCallback callback = callbackWeakReference.get(); + if (callback != null) { + callback.onFirewallStopped(result); + } } } @@ -138,30 +189,8 @@ public class FirewallHelper implements FirewallCallback { } public void shutdownFirewall() { - ShutdownFirewallTask task = new ShutdownFirewallTask(); + ShutdownFirewallTask task = new ShutdownFirewallTask(this); task.execute(); } - public static boolean hasSU() { - StringBuilder log = new StringBuilder(); - - try { - String suCommand = "su -v"; - runBlockingCmd(new String[]{suCommand}, log); - } catch (Exception e) { - return false; - } - - return !TextUtils.isEmpty(log) && !log.toString().contains("su: not found"); - } - - public static boolean requestSU() { - try { - String suCommand = "su"; - return runBlockingCmd(new String[]{suCommand}, null) == 0; - } catch (Exception e) { - return false; - } - } - } diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java index 9eac7187..bf97b5c5 100644 --- a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java @@ -31,6 +31,7 @@ import static se.leap.bitmaskclient.Constants.PROVIDER_EIP_DEFINITION; import static se.leap.bitmaskclient.Constants.PROVIDER_PRIVATE_KEY; import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE; import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES; +import static se.leap.bitmaskclient.Constants.SU_PERMISSION; import static se.leap.bitmaskclient.Constants.USE_PLUGGABLE_TRANSPORTS; import static se.leap.bitmaskclient.Constants.EXCLUDED_APPS; @@ -214,6 +215,14 @@ public class PreferenceHelper { apply(); } + public static boolean hasSuPermission(Context context) { + return getBoolean(context, SU_PERMISSION, false); + } + + public static void setSuPermission(Context context, boolean allowed) { + putBoolean(context, SU_PERMISSION, allowed); + } + public static boolean getUsePluggableTransports(Context context) { if (context == null) { return false; @@ -296,9 +305,27 @@ public class PreferenceHelper { return preferences.getString(key, defValue); } - public static void putString(Context context, String key, String value){ + public static void putString(Context context, String key, String value) { SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); preferences.edit().putString(key, value).apply(); } + public static Boolean getBoolean(Context context, String key, Boolean defValue) { + if (context == null) { + return false; + } + + SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); + return preferences.getBoolean(key, defValue); + } + + public static void putBoolean(Context context, String key, Boolean value) { + if (context == null) { + return; + } + + SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); + preferences.edit().putBoolean(key, value).apply(); + } + } -- cgit v1.2.3 From d57d75e13daceb4bccc5e4aa1b7769be27a9a5c5 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Dec 2019 17:16:44 +0100 Subject: reduce code duplication in PreferenceHelper --- .../leap/bitmaskclient/utils/PreferenceHelper.java | 36 ++++------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java index bf97b5c5..40bb2eca 100644 --- a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java @@ -224,51 +224,27 @@ public class PreferenceHelper { } public static boolean getUsePluggableTransports(Context context) { - if (context == null) { - return false; - } - SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); - return preferences.getBoolean(USE_PLUGGABLE_TRANSPORTS, false); + return getBoolean(context, USE_PLUGGABLE_TRANSPORTS, false); } public static void usePluggableTransports(Context context, boolean isEnabled) { - if (context == null) { - return; - } - SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); - preferences.edit().putBoolean(USE_PLUGGABLE_TRANSPORTS, isEnabled).apply(); + putBoolean(context, USE_PLUGGABLE_TRANSPORTS, isEnabled); } public static void saveBattery(Context context, boolean isEnabled) { - if (context == null) { - return; - } - SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); - preferences.edit().putBoolean(DEFAULT_SHARED_PREFS_BATTERY_SAVER, isEnabled).apply(); + putBoolean(context, DEFAULT_SHARED_PREFS_BATTERY_SAVER, isEnabled); } public static boolean getSaveBattery(Context context) { - if (context == null) { - return false; - } - SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); - return preferences.getBoolean(DEFAULT_SHARED_PREFS_BATTERY_SAVER, false); + return getBoolean(context, DEFAULT_SHARED_PREFS_BATTERY_SAVER, false); } public static void saveShowAlwaysOnDialog(Context context, boolean showAlwaysOnDialog) { - if (context == null) { - return; - } - SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); - preferences.edit().putBoolean(ALWAYS_ON_SHOW_DIALOG, showAlwaysOnDialog).apply(); + putBoolean(context, ALWAYS_ON_SHOW_DIALOG, showAlwaysOnDialog); } public static boolean getShowAlwaysOnDialog(Context context) { - if (context == null) { - return true; - } - SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE); - return preferences.getBoolean(ALWAYS_ON_SHOW_DIALOG, true); + return getBoolean(context, ALWAYS_ON_SHOW_DIALOG, true); } public static JSONObject getEipDefinitionFromPreferences(SharedPreferences preferences) { -- cgit v1.2.3 From ab33fb0095960ef2fabf36dad62cf2f69dac7f69 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Dec 2019 17:17:17 +0100 Subject: reduce log pollution --- app/src/main/java/se/leap/bitmaskclient/Provider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java index 507a11bf..b98c3fd3 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Provider.java +++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java @@ -141,7 +141,7 @@ public final class Provider implements Parcelable { } } } catch (Exception e) { - e.printStackTrace(); + // ignore } return false; } -- cgit v1.2.3 From 56c542d37f3fcaaa69ec8d6ef7014a8cc6dbaa06 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 30 Dec 2019 17:32:41 +0100 Subject: adapt log strings a little bit --- .../main/java/se/leap/bitmaskclient/utils/FirewallHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java index 8b80f1f0..26e6603a 100644 --- a/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/utils/FirewallHelper.java @@ -47,18 +47,18 @@ public class FirewallHelper implements FirewallCallback { @Override public void onFirewallStarted(boolean success) { if (success) { - VpnStatus.logInfo("[FIREWALL] custom rules established"); + VpnStatus.logInfo("[FIREWALL] Custom rules established"); } else { - VpnStatus.logError("[FIREWALL] could not establish custom rules."); + VpnStatus.logError("[FIREWALL] Could not establish custom rules."); } } @Override public void onFirewallStopped(boolean success) { if (success) { - VpnStatus.logInfo("[FIREWALL] custom rules deleted"); + VpnStatus.logInfo("[FIREWALL] Custom rules deleted"); } else { - VpnStatus.logError("[FIREWALL] could not delete custom rules"); + VpnStatus.logError("[FIREWALL] Could not delete custom rules"); } } @@ -66,7 +66,7 @@ public class FirewallHelper implements FirewallCallback { public void onSuRequested(boolean success) { PreferenceHelper.setSuPermission(context, success); if (!success) { - VpnStatus.logError("[FIREWALL] Bitmask needs root permission to execute custom firewall rules."); + VpnStatus.logError("[FIREWALL] Root permission needed to execute custom firewall rules."); } } -- cgit v1.2.3