Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SwapWorkflowActivity: save BluetoothAdapter instance for reuse

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2019-05-22 16:15:10 +02:00
parent da66949b9e
commit ddbe93aeb4
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
View File

@ -118,6 +118,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
private NewRepoConfig confirmSwapConfig; private NewRepoConfig confirmSwapConfig;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private WifiManager wifiManager; private WifiManager wifiManager;
private BluetoothAdapter bluetoothAdapter;
@LayoutRes @LayoutRes
private int currentSwapViewLayoutRes = STEP_INTRO; private int currentSwapViewLayoutRes = STEP_INTRO;
@ -228,6 +229,8 @@ public class SwapWorkflowActivity extends AppCompatActivity {
wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
new SwapDebug().logStatus(); new SwapDebug().logStatus();
} }
@ -561,10 +564,9 @@ public class SwapWorkflowActivity extends AppCompatActivity {
} }
public void sendFDroid() { public void sendFDroid() {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); if (bluetoothAdapter == null
if (adapter == null
|| Build.VERSION.SDK_INT >= 23 // TODO make Bluetooth work with content:// URIs || Build.VERSION.SDK_INT >= 23 // TODO make Bluetooth work with content:// URIs
|| (!adapter.isEnabled() && LocalHTTPDManager.isAlive())) { || (!bluetoothAdapter.isEnabled() && LocalHTTPDManager.isAlive())) {
inflateSwapView(R.layout.swap_send_fdroid); inflateSwapView(R.layout.swap_send_fdroid);
} else { } else {
sendFDroidBluetooth(); sendFDroidBluetooth();
@ -577,7 +579,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
* automatically enable Bluetooth. * automatically enable Bluetooth.
*/ */
public void sendFDroidBluetooth() { public void sendFDroidBluetooth() {
if (BluetoothAdapter.getDefaultAdapter().isEnabled()) { if (bluetoothAdapter.isEnabled()) {
sendFDroidApk(); sendFDroidApk();
} else { } else {
Intent discoverBt = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE); Intent discoverBt = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
@ -742,12 +744,8 @@ public class SwapWorkflowActivity extends AppCompatActivity {
* involves pairing and connecting with other devices. * involves pairing and connecting with other devices.
*/ */
public void startBluetoothSwap() { public void startBluetoothSwap() {
if (bluetoothAdapter != null) {
Utils.debugLog(TAG, "Initiating Bluetooth swap, will ensure the Bluetooth devices is enabled and discoverable before starting server."); if (bluetoothAdapter.isEnabled()) {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null) {
if (adapter.isEnabled()) {
Utils.debugLog(TAG, "Bluetooth enabled, will check if device is discoverable with device."); Utils.debugLog(TAG, "Bluetooth enabled, will check if device is discoverable with device.");
ensureBluetoothDiscoverableThenStart(); ensureBluetoothDiscoverableThenStart();
} else { } else {
@ -760,7 +758,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
private void ensureBluetoothDiscoverableThenStart() { private void ensureBluetoothDiscoverableThenStart() {
Utils.debugLog(TAG, "Ensuring Bluetooth is in discoverable mode."); Utils.debugLog(TAG, "Ensuring Bluetooth is in discoverable mode.");
if (BluetoothAdapter.getDefaultAdapter().getScanMode() != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) { if (bluetoothAdapter.getScanMode() != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
// TODO: Listen for BluetoothAdapter.ACTION_SCAN_MODE_CHANGED and respond if discovery // TODO: Listen for BluetoothAdapter.ACTION_SCAN_MODE_CHANGED and respond if discovery
// is cancelled prematurely. // is cancelled prematurely.
@ -803,14 +801,14 @@ public class SwapWorkflowActivity extends AppCompatActivity {
} else { } else {
String bluetooth = getSwapService().getBluetoothSwap().isConnected() ? "Y" : " N"; String bluetooth = getSwapService().getBluetoothSwap().isConnected() ? "Y" : " N";
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
bluetooth = "N/A"; bluetooth = "N/A";
if (adapter != null) { if (bluetoothAdapter != null) {
Map<Integer, String> scanModes = new HashMap<>(3); Map<Integer, String> scanModes = new HashMap<>(3);
scanModes.put(BluetoothAdapter.SCAN_MODE_CONNECTABLE, "CON"); scanModes.put(BluetoothAdapter.SCAN_MODE_CONNECTABLE, "CON");
scanModes.put(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, "CON_DISC"); scanModes.put(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, "CON_DISC");
scanModes.put(BluetoothAdapter.SCAN_MODE_NONE, "NONE"); scanModes.put(BluetoothAdapter.SCAN_MODE_NONE, "NONE");
bluetooth = "\"" + adapter.getName() + "\" - " + scanModes.get(adapter.getScanMode()); bluetooth = "\"" + bluetoothAdapter.getName() + "\" - "
+ scanModes.get(bluetoothAdapter.getScanMode());
} }
} }