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

Disable Bluetooth at shutdown if we enabled it.

Browse Source
This commit is contained in:
akwizgran
2017-10-03 15:58:23 +01:00
parent 3c95988693
commit 9993bac3a1
7 changed files with 99 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
View File

@@ -22,6 +22,7 @@ import android.widget.Toast;
import com.google.zxing.Result;
import org.briarproject.bramble.api.event.Event;
import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.keyagreement.KeyAgreementTask;
import org.briarproject.bramble.api.keyagreement.KeyAgreementTaskFactory;
import org.briarproject.bramble.api.keyagreement.Payload;
@@ -36,7 +37,7 @@ import org.briarproject.bramble.api.keyagreement.event.KeyAgreementWaitingEvent;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.bramble.api.system.AndroidExecutor;
import org.briarproject.bramble.api.plugin.event.EnableBluetoothEvent;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.fragment.BaseEventFragment;
@@ -73,10 +74,10 @@ public class ShowQrCodeFragment extends BaseEventFragment
@Inject
PayloadParser payloadParser;
@Inject
AndroidExecutor androidExecutor;
@Inject
@IoExecutor
Executor ioExecutor;
@Inject
EventBus eventBus;
private CameraView cameraView;
private View statusView;
@@ -160,12 +161,7 @@ public class ShowQrCodeFragment extends BaseEventFragment
final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null && !adapter.isEnabled()) {
waitingForBluetooth = true;
androidExecutor.runOnBackgroundThread(new Runnable() {
@Override
public void run() {
adapter.enable();
}
});
eventBus.broadcast(new EnableBluetoothEvent());
} else {
startListening();
}
@@ -385,7 +381,6 @@ public class ShowQrCodeFragment extends BaseEventFragment
public void onReceive(Context ctx, Intent intent) {
int state = intent.getIntExtra(EXTRA_STATE, 0);
if (state == STATE_ON && waitingForBluetooth) {
LOG.info("Bluetooth enabled");
waitingForBluetooth = false;
startListening();
}

17
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.briar.android.settings;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.content.Intent;
import android.media.Ringtone;
@@ -26,6 +25,8 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.bramble.api.plugin.BluetoothConstants;
import org.briarproject.bramble.api.plugin.TorConstants;
import org.briarproject.bramble.api.plugin.event.DisableBluetoothEvent;
import org.briarproject.bramble.api.plugin.event.EnableBluetoothEvent;
import org.briarproject.bramble.api.settings.Settings;
import org.briarproject.bramble.api.settings.SettingsManager;
import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
@@ -338,17 +339,9 @@ public class SettingsFragment extends PreferenceFragmentCompat
return true;
}
private void enableOrDisableBluetooth(final boolean enable) {
final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null) {
androidExecutor.runOnBackgroundThread(new Runnable() {
@Override
public void run() {
if (enable) adapter.enable();
else adapter.disable();
}
});
}
private void enableOrDisableBluetooth(boolean enable) {
if (enable) eventBus.broadcast(new EnableBluetoothEvent());
else eventBus.broadcast(new DisableBluetoothEvent());
}
private void storeTorSettings(final int torSetting) {