From 53f6f24d53a86aa956d69e7b58b4059f39e73ee3 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 3 Dec 2015 17:13:49 +0000
Subject: [PATCH] Don't enable Bluetooth by default. #99
---
.../org/briarproject/android/SettingsActivity.java | 3 +--
.../plugins/droidtooth/DroidtoothPlugin.java | 12 +++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/SettingsActivity.java b/briar-android/src/org/briarproject/android/SettingsActivity.java
index a01391602e..5bc03653c4 100644
--- a/briar-android/src/org/briarproject/android/SettingsActivity.java
+++ b/briar-android/src/org/briarproject/android/SettingsActivity.java
@@ -217,7 +217,7 @@ OnClickListener {
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("Loading settings took " + duration + " ms");
- bluetoothSetting = c.getBoolean("enable", true);
+ bluetoothSetting = c.getBoolean("enable", false);
displaySettings();
} catch (DbException e) {
if (LOG.isLoggable(WARNING))
@@ -280,7 +280,6 @@ OnClickListener {
}
storeBluetoothSetting();
displaySettings();
- return;
} else if (view == notifyPrivateMessages) {
Settings s = new Settings();
s.putBoolean("notifyPrivateMessages",
diff --git a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
index c898aef03e..4191e35617 100644
--- a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
@@ -135,12 +135,14 @@ class DroidtoothPlugin implements DuplexPlugin {
// If Bluetooth is enabled, bind a socket - otherwise enable it
if (adapter.isEnabled()) {
bind();
- } else if (callback.getConfig().getBoolean("enable", true)) {
- wasDisabled = true;
- if (adapter.enable()) LOG.info("Enabling Bluetooth");
- else LOG.info("Could not enable Bluetooth");
} else {
- LOG.info("Not enabling Bluetooth");
+ wasDisabled = true;
+ if (callback.getConfig().getBoolean("enable", false)) {
+ if (adapter.enable()) LOG.info("Enabling Bluetooth");
+ else LOG.info("Could not enable Bluetooth");
+ } else {
+ LOG.info("Not enabling Bluetooth");
+ }
}
return true;
}
--
GitLab