Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Don't enable Bluetooth by default. #99

Browse Source
This commit is contained in:
akwizgran
2015-12-03 17:13:49 +00:00
parent 8529c976c2
commit 53f6f24d53
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/org/briarproject/android/SettingsActivity.java
View File

@@ -217,7 +217,7 @@ OnClickListener {
long duration = System.currentTimeMillis() - now; long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO)) if (LOG.isLoggable(INFO))
LOG.info("Loading settings took " + duration + " ms"); LOG.info("Loading settings took " + duration + " ms");
bluetoothSetting = c.getBoolean("enable", true); bluetoothSetting = c.getBoolean("enable", false);
displaySettings(); displaySettings();
} catch (DbException e) { } catch (DbException e) {
if (LOG.isLoggable(WARNING)) if (LOG.isLoggable(WARNING))
@@ -280,7 +280,6 @@ OnClickListener {
} }
storeBluetoothSetting(); storeBluetoothSetting();
displaySettings(); displaySettings();
return;
} else if (view == notifyPrivateMessages) { } else if (view == notifyPrivateMessages) {
Settings s = new Settings(); Settings s = new Settings();
s.putBoolean("notifyPrivateMessages", s.putBoolean("notifyPrivateMessages",

12
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -135,12 +135,14 @@ class DroidtoothPlugin implements DuplexPlugin {
// If Bluetooth is enabled, bind a socket - otherwise enable it // If Bluetooth is enabled, bind a socket - otherwise enable it
if (adapter.isEnabled()) { if (adapter.isEnabled()) {
bind(); 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 { } 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; return true;
} }