Don't enable Bluetooth by default. #99

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",

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;
 	}