simplify address based connect

Signed-off-by: Bjørn Mork <bjorn@mork.no>

3 files changed, 15 insertions, 14 deletions

diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java
index 4f1f974..00a643a 100644
--- a/Defogger/src/no/mork/android/defogger/MainActivity.java
+++ b/Defogger/src/no/mork/android/defogger/MainActivity.java
@@ -188,10 +188,7 @@ public class MainActivity extends Activity {
 	    Log.d(msg, "Got invalid MAC address from QR scan:" + mac.toString());
 	    return;
 	}
-
-	Log.d(msg, "Will attempt to connect to Bluetooth device " + mac.toString());
-	BluetoothDevice device = bluetoothAdapter.getRemoteDevice(mac.toString());
-	connectDevice(device);
+	connectDevice(mac.toString());
     }
 
     // utilities
@@ -467,7 +464,12 @@ public class MainActivity extends Activity {
 	GattClientCallback gattClientCallback = new GattClientCallback();
         mGatt = device.connectGatt(this, true, gattClientCallback);
     }
-	    
+
+    private void connectDevice(String macaddress) {
+	BluetoothDevice device = bluetoothAdapter.getRemoteDevice(macaddress);
+	connectDevice(device);
+    }
+
     private void disconnectDevice() {
 	// reset status to default
 	connected = false;
diff --git a/Defogger/src/no/mork/android/defogger/ScanListAdapter.java b/Defogger/src/no/mork/android/defogger/ScanListAdapter.java
index e386056..db6272c 100644
--- a/Defogger/src/no/mork/android/defogger/ScanListAdapter.java
+++ b/Defogger/src/no/mork/android/defogger/ScanListAdapter.java
@@ -1,3 +1,7 @@
+/*
+ *  SPDX-License-Identifier: GPL-3.0-only
+ *  Copyright (c) 2019  Bjørn Mork <bjorn@mork.no>
+ */
 package no.mork.android.defogger;
 
 import android.bluetooth.BluetoothDevice;
@@ -12,10 +16,6 @@ import android.widget.TextView;
 import java.util.ArrayList;
 import no.mork.android.defogger.ScannerActivity;
 
-// originally from https://developer.android.com/guide/topics/ui/layout/recyclerview
-// but converted to simpler ArrayAdapter using https://developer.android.com/guide/topics/ui/declaring-layout.html#FillingTheLayout
-
-
 public class ScanListAdapter extends BaseAdapter {
     private static String msg = "Defogger Adapter: ";
     private ArrayList<BluetoothDevice> mObjects;
diff --git a/Defogger/src/no/mork/android/defogger/ScannerActivity.java b/Defogger/src/no/mork/android/defogger/ScannerActivity.java
index 098b139..b669e0b 100644
--- a/Defogger/src/no/mork/android/defogger/ScannerActivity.java
+++ b/Defogger/src/no/mork/android/defogger/ScannerActivity.java
@@ -1,3 +1,7 @@
+/*
+ *  SPDX-License-Identifier: GPL-3.0-only
+ *  Copyright (c) 2019  Bjørn Mork <bjorn@mork.no>
+ */
 package no.mork.android.defogger;
 
 import android.app.Activity;
@@ -21,8 +25,6 @@ import android.widget.Toast;
 import java.util.ArrayList;
 import java.util.List;
 
-// lots of nice examples: https://www.programcreek.com/java-api-examples/index.php?api=android.bluetooth.le.ScanCallback
-
 public class ScannerActivity extends Activity implements Runnable {
     private static String msg = "Defogger Scanning: ";
     // Stops scanning after 10 seconds.
@@ -43,7 +45,6 @@ public class ScannerActivity extends Activity implements Runnable {
 
 	@Override
 	public void onScanResult(int callbackType, ScanResult result) {
-	    Log.d(msg, "onScanResult(): " + callbackType);
 	    super.onScanResult(callbackType, result);
 	    addScanResult(result);
 	}
@@ -63,10 +64,8 @@ public class ScannerActivity extends Activity implements Runnable {
 
         private void addScanResult(ScanResult result) {
             BluetoothDevice device = result.getDevice();
-	    Log.d(msg, "adding " + device.toString());
 	    mScanResults.add(device);
         }
-
     };
 
     @Override