From 7ea612a8ba81e07898e6e1dc0e02e07e9faefac4 Mon Sep 17 00:00:00 2001 From: Bjørn Mork Date: Fri, 31 May 2019 16:40:48 +0200 Subject: move pincode input to scanner activity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bjørn Mork --- Defogger/res/layout/activity_main.xml | 6 ------ Defogger/res/layout/activity_scanner.xml | 13 ++++++++++--- .../src/no/mork/android/defogger/MainActivity.java | 20 ++++++++------------ .../no/mork/android/defogger/ScannerActivity.java | 7 +++++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml index d06ea5e..9bd8f79 100644 --- a/Defogger/res/layout/activity_main.xml +++ b/Defogger/res/layout/activity_main.xml @@ -18,12 +18,6 @@ android:layout_height="wrap_content" android:text="@string/start_scan"/> - - - + + + android:layout_height="fill_parent" + android:layout_below="@+id/pincode" /> - + diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java index d34f789..a8c1f23 100644 --- a/Defogger/src/no/mork/android/defogger/MainActivity.java +++ b/Defogger/src/no/mork/android/defogger/MainActivity.java @@ -38,6 +38,7 @@ public class MainActivity extends Activity { private static final int REQUEST_ENABLE_BT = 0x1042; private BluetoothAdapter bluetoothAdapter; private BluetoothGatt mGatt; + private String pincode; @Override protected void onCreate(Bundle savedInstanceState) { @@ -95,6 +96,7 @@ public class MainActivity extends Activity { break; default: dev = dataIntent.getExtras().getParcelable("btdevice"); + pincode = dataIntent.getStringExtra("pincode"); TextView hello_text = (TextView) findViewById(requestCode); // String messageReturn = resultCode == RESULT_OK ? dataIntent.getStringExtra("scan_ret") : "not OK"; @@ -162,6 +164,7 @@ public class MainActivity extends Activity { private String multimsg; public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) { + // FIXME: verify connected.... Log.d(msg, "onConnectionStateChange() " + status + " " + newState); gatt.discoverServices(); } @@ -198,11 +201,7 @@ public class MainActivity extends Activity { switch (code) { case 0xa001: - EditText pincode = (EditText) findViewById(R.id.pincode); - - Log.d(msg, "pincode is " + pincode.getText()); - - String hashit = gatt.getDevice().getName() + getPinCode() + kv.get("C"); + String hashit = gatt.getDevice().getName() + pincode + kv.get("C"); Log.d(msg, "hashit string is " + hashit); String key = calculateKey(hashit); @@ -257,11 +256,6 @@ public class MainActivity extends Activity { mGatt.close(); } - private String getPinCode() { - EditText pincode = (EditText) findViewById(R.id.pincode); - return pincode.getText().toString(); - } - // camera specific code private BluetoothGattService getIPCamService() { // FIXME: bail out if not found @@ -269,11 +263,13 @@ public class MainActivity extends Activity { } private void notifications(boolean enable) { + Log.d(msg, "notifications()"); BluetoothGattCharacteristic c = getIPCamService().getCharacteristic(UUID.fromString("0000a000-0000-1000-8000-00805f9b34fb")); mGatt.setCharacteristicNotification(c, enable); } private void getLock() { + Log.d(msg, "getLock()"); BluetoothGattCharacteristic c = getIPCamService().getCharacteristic(UUID.fromString("0000a001-0000-1000-8000-00805f9b34fb")); mGatt.readCharacteristic(c); } @@ -294,7 +290,7 @@ public class MainActivity extends Activity { private void setInitialPassword() { Log.d(msg, "setInitialPassword()"); BluetoothGattCharacteristic c = getIPCamService().getCharacteristic(UUID.fromString("0000a201-0000-1000-8000-00805f9b34fb")); - c.setValue("P=;N=" + getPinCode()); + c.setValue("P=;N=" + pincode); mGatt.writeCharacteristic(c); } @@ -303,7 +299,7 @@ public class MainActivity extends Activity { Log.d(msg, "runCommand() will try to run " + command); BluetoothGattCharacteristic c = getIPCamService().getCharacteristic(UUID.fromString("0000a201-0000-1000-8000-00805f9b34fb")); - c.setValue("P=" + getPinCode() + ";N=" + getPinCode() + "&&(" + command + ")&"); + c.setValue("P=" + pincode + ";N=" + pincode + "&&(" + command + ")&"); mGatt.writeCharacteristic(c); } diff --git a/Defogger/src/no/mork/android/defogger/ScannerActivity.java b/Defogger/src/no/mork/android/defogger/ScannerActivity.java index 890a4fd..f645a6c 100644 --- a/Defogger/src/no/mork/android/defogger/ScannerActivity.java +++ b/Defogger/src/no/mork/android/defogger/ScannerActivity.java @@ -15,6 +15,7 @@ import android.os.Handler; import android.os.ParcelUuid; import android.util.Log; import android.widget.ArrayAdapter; +import android.widget.EditText; import android.widget.ListView; import android.widget.Toast; import java.util.ArrayList; @@ -102,8 +103,10 @@ public class ScannerActivity extends Activity implements Runnable { public void returnScanResult(BluetoothDevice device) { Log.d(msg, "returnScanResult()"); stopScan(); - Intent intent = new Intent(); - intent.putExtra("scan_ret", device.toString()); + + EditText pincode = (EditText) findViewById(R.id.pincode); + Intent intent = new Intent(); + intent.putExtra("pincode", pincode.getText().toString()); intent.putExtra("btdevice", device); setResult(RESULT_OK, intent); finish(); -- cgit v1.2.3