ipcam activity is functional. needs cleanup

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

5 files changed, 37 insertions, 630 deletions

diff --git a/Defogger/AndroidManifest.xml b/Defogger/AndroidManifest.xml
index cd75919..eb67dda 100644
--- a/Defogger/AndroidManifest.xml
+++ b/Defogger/AndroidManifest.xml
@@ -27,7 +27,11 @@
        <activity
            a:name=".ScannerActivity"
 	   a:parentActivityName=".MainActivity" />
-	
+
+       <activity
+           a:name=".IpCamActivity"
+	   a:parentActivityName=".MainActivity" />
+
   </application>
 
 </manifest>
diff --git a/Defogger/Makefile b/Defogger/Makefile
index 395eb80..e975a1c 100644
--- a/Defogger/Makefile
+++ b/Defogger/Makefile
@@ -14,7 +14,7 @@ JAVAVER ?= 8
 ANDROID_HOME ?= /usr/lib/android-sdk
 SDKCLASSPATH ?= $(ANDROID_HOME)/platforms/android-$(APIVER)/android.jar
 
-RESOURCES=layout/activity_main.xml layout/activity_scanner.xml layout/item_scan.xml layout/item_net.xml values/strings.xml
+RESOURCES=layout/activity_main.xml layout/activity_scanner.xml layout/activity_ipcam.xml layout/item_scan.xml layout/item_net.xml values/strings.xml
 RES=$(addprefix res/,$(RESOURCES))
 
 ## Temp disabled while we have some non-building classess....
@@ -23,6 +23,7 @@ CLASSES=obj/no/mork/android/defogger/R.class $(patsubst src/%.java,obj/%.class,\
 	src/no/mork/android/defogger/MainActivity.java \
 	src/no/mork/android/defogger/ScannerActivity.java \
 	src/no/mork/android/defogger/ScanListAdapter.java \
+	src/no/mork/android/defogger/IpCamActivity.java \
 	$(wildcard src/com/google/zxing/integration/android/*.java))
 
 all: defogger.apk
diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml
index df1ab37..0df524f 100644
--- a/Defogger/res/layout/activity_main.xml
+++ b/Defogger/res/layout/activity_main.xml
@@ -4,13 +4,13 @@
    android:orientation="vertical" >
    
    <TextView
-       android:id="@+id/statustext"
+       android:id="@+id/mainstatus"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_centerHorizontal="true"
        android:layout_centerVertical="true"
-       android:text="@string/hello_msg"
-       tools:context=".MainActivity" />
+       android:text="@string/hello_msg" />
+
    <Button
        android:id="@+id/start_scan"
        android:layout_width="match_parent"
@@ -23,78 +23,5 @@
        android:layout_height="wrap_content"
        android:onClick="startQRReaderActivity"
        android:text="@string/read_qrcode"/>
-   <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/command" />
-   
-   <EditText
-       android:id="@+id/command"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:inputType="text"
-       android:imeOptions="actionDone"
-       android:imeActionLabel="Run" />
-   <Button
-       android:id="@+id/wificonfig"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content"
-       android:onClick="getWifiConfig"
-       android:text="@string/wificonfig"/>
-   <Button
-       android:id="@+id/ipconfig"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content"
-       android:onClick="getIpConfig"
-       android:text="@string/ipconfig"/>
-   <TextView
-       android:id="@+id/ipaddress"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
-   <TextView
-       android:id="@+id/netmask"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
-   <TextView
-       android:id="@+id/gateway"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
-   <TextView
-       android:id="@+id/dns"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
-   
-   <Button
-       android:id="@+id/sysinfo"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content"
-       android:onClick="getSysInfo"
-       android:text="@string/sysinfo"/>
-   <TextView
-       android:id="@+id/sysname"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
-   <TextView
-       android:id="@+id/systime"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
-   <TextView
-       android:id="@+id/version"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
-   <TextView
-       android:id="@+id/macaddress"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
-   <Button
-       android:id="@+id/setup"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content"
-       android:onClick="getWifiLink"
-       android:text="@string/setup"/>
-   <ListView
-       android:id="@+id/networks"
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"/>
 
 </LinearLayout>
diff --git a/Defogger/src/no/mork/android/defogger/IpCamActivity.java b/Defogger/src/no/mork/android/defogger/IpCamActivity.java
index 13a7e75..b99cf29 100644
--- a/Defogger/src/no/mork/android/defogger/IpCamActivity.java
+++ b/Defogger/src/no/mork/android/defogger/IpCamActivity.java
@@ -33,9 +33,6 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
-
 import java.lang.StringBuilder;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -47,15 +44,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-//import no.mork.android.defogger.ScannerActivity;
-
-public class MainActivity extends Activity {
-    private static String msg = "Defogger MainActivity: ";
+public class IpCamActivity extends Activity {
+    private static String msg = "Defogger IPCamActivity: ";
 
-    private static final int REQUEST_ENABLE_BT  = 1;
-    private static final int REQUEST_GET_DEVICE = 2;
-    
-    private BluetoothAdapter bluetoothAdapter;
     private BluetoothGatt mGatt;
     private BluetoothGattService ipcamService;
     private String pincode;
@@ -70,8 +61,17 @@ public class MainActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 	super.onCreate(savedInstanceState);
-	setContentView(R.layout.activity_main);
-
+	setContentView(R.layout.activity_ipcam);
+
+	// Get the Intent that started this activity and extract parameters
+	Intent intent = getIntent();
+	pincode = intent.getStringExtra("pincode");
+	BluetoothDevice dev = intent.getExtras().getParcelable("btdevice");
+	if (pincode == null || dev == null)
+	    finish();
+	
+	connectDevice(dev);
+	
 	EditText cmd = (EditText) findViewById(R.id.command);
 	cmd.setOnEditorActionListener(new OnEditorActionListener() {
 		@Override
@@ -88,107 +88,6 @@ public class MainActivity extends Activity {
     @Override
     protected void onResume() {
         super.onResume();
-	getBluetoothAdapter();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent dataIntent) {
-        super.onActivityResult(requestCode, resultCode, dataIntent);
-
-	switch (requestCode) {
-	case IntentIntegrator.REQUEST_CODE:
-	    IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, dataIntent);
-	    if (scanResult != null)
-		handleQRScanResult(scanResult);
-	    break;
-	case REQUEST_ENABLE_BT:
-	    if (resultCode != RESULT_OK) { // user refused to enable BT?
-		setStatus("Bluetooth is disabled");
-		finish();
-	    }	    
-		
-	    break;
-	case REQUEST_GET_DEVICE:
-	    if (resultCode != RESULT_OK) {
-		setStatus("Failed to find a camera");
-		break;
-	    }
-
-	    BluetoothDevice dev = dataIntent.getExtras().getParcelable("btdevice");
-	    if (dev == null) {
-		setStatus("No camera selected");
-		break;
-	    }
-
-	    pincode = dataIntent.getStringExtra("pincode");
-	    if (pincode == null || pincode.length() < 6) {
-		setStatus("Bogus pincode");
-		break;
-	    }
-		
-	    connectDevice(dev);
-	    break;
-	default:
-	    Log.d(msg, "unknown request???");
-	}
-    }
-
-    // find and enable a bluetooth adapter with LE support
-    protected void getBluetoothAdapter() {
-	final BluetoothManager bluetoothManager = (BluetoothManager) getSystemService(Context.BLUETOOTH_SERVICE);
-	bluetoothAdapter = bluetoothManager.getAdapter();
-
-	if (bluetoothAdapter == null) {
-	    setStatus("Bluetooth is unsupported");
-            finish();
-	}	    
-	    
-        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
-            setStatus("No Bluetooth Low Energy support");
-            finish();
-        }
-
-	if (!bluetoothAdapter.isEnabled()) {
-	    Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-	    startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
-	}
-    }
-
-    public void startScannerActivity(View view) {
-	disconnectDevice();
-	Intent intent = new Intent(view.getContext(), ScannerActivity.class);
-	startActivityForResult(intent, REQUEST_GET_DEVICE);
-    }
-
-    public void startQRReaderActivity(View view) {
-	IntentIntegrator integrator = new IntentIntegrator(this);
-	integrator.initiateScan();
-    }
-
-    private void handleQRScanResult(IntentResult res) {
-	Log.d(msg, "QR scan resturned: " + res.toString());
-
-	// DCS-8000LH,A3,12345678,B0C554AABBCC,DCS-8000LH-BBCC,123456
-	String[] data = res.getContents().split(",");
-	if (data.length != 6 || data[3].length() != 12 || data[5].length() != 6) {
-	    setStatus("Unexpected QR scan result - wrong format");
-	    return;
-	}
-
-	pincode = data[5];
-
-	StringBuilder mac = new StringBuilder(data[3]);
-	mac.insert(10, ':');
-	mac.insert(8, ':');
-	mac.insert(6, ':');
-	mac.insert(4, ':');
-	mac.insert(2, ':');
-
-	if (!bluetoothAdapter.checkBluetoothAddress(mac.toString())) {
-	    Log.d(msg, "Got invalid MAC address from QR scan:" + mac.toString());
-	    return;
-	}
-	connectDevice(mac.toString());
     }
 
     // utilities
@@ -465,11 +364,6 @@ public class MainActivity extends Activity {
         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;
@@ -480,6 +374,7 @@ public class MainActivity extends Activity {
 	    return;
 	Log.d(msg, "disconnectDevice() " + mGatt.getDevice().getAddress());
 	mGatt.close();
+	finish();
     }
 
     // camera specific code
diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java
index 13a7e75..4703900 100644
--- a/Defogger/src/no/mork/android/defogger/MainActivity.java
+++ b/Defogger/src/no/mork/android/defogger/MainActivity.java
@@ -56,33 +56,11 @@ public class MainActivity extends Activity {
     private static final int REQUEST_GET_DEVICE = 2;
     
     private BluetoothAdapter bluetoothAdapter;
-    private BluetoothGatt mGatt;
-    private BluetoothGattService ipcamService;
-    private String pincode;
-    private ArrayDeque<BluetoothGattCharacteristic> readQ;
-    private ArrayDeque<BluetoothGattCharacteristic> writeQ;
-
-    // status
-    private boolean connected = false;
-    private boolean locked = true;
-    private boolean wifilink = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 	super.onCreate(savedInstanceState);
 	setContentView(R.layout.activity_main);
-
-	EditText cmd = (EditText) findViewById(R.id.command);
-	cmd.setOnEditorActionListener(new OnEditorActionListener() {
-		@Override
-		public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-		    if (actionId == EditorInfo.IME_ACTION_DONE) {
-			runCommand(v.getText().toString());
-			return true;
-		    }
-		    return false;
-		}
-	    });
     }
 
     @Override
@@ -120,13 +98,13 @@ public class MainActivity extends Activity {
 		break;
 	    }
 
-	    pincode = dataIntent.getStringExtra("pincode");
+	    String pincode = dataIntent.getStringExtra("pincode");
 	    if (pincode == null || pincode.length() < 6) {
 		setStatus("Bogus pincode");
 		break;
 	    }
-		
-	    connectDevice(dev);
+
+	    startIpCamActivity(dev, pincode);
 	    break;
 	default:
 	    Log.d(msg, "unknown request???");
@@ -154,8 +132,14 @@ public class MainActivity extends Activity {
 	}
     }
 
+    public void startIpCamActivity(BluetoothDevice device, String pincode) {
+	Intent intent = new Intent(this, IpCamActivity.class);
+	intent.putExtra("pincode", pincode);
+	intent.putExtra("btdevice", device);
+	startActivity(intent);
+    }
+
     public void startScannerActivity(View view) {
-	disconnectDevice();
 	Intent intent = new Intent(view.getContext(), ScannerActivity.class);
 	startActivityForResult(intent, REQUEST_GET_DEVICE);
     }
@@ -175,8 +159,6 @@ public class MainActivity extends Activity {
 	    return;
 	}
 
-	pincode = data[5];
-
 	StringBuilder mac = new StringBuilder(data[3]);
 	mac.insert(10, ':');
 	mac.insert(8, ':');
@@ -188,422 +170,20 @@ public class MainActivity extends Activity {
 	    Log.d(msg, "Got invalid MAC address from QR scan:" + mac.toString());
 	    return;
 	}
-	connectDevice(mac.toString());
-    }
-
-    // utilities
-    private Map<String,String> splitKV(String kv, String splitter)
-    {
-	Map<String,String> ret = new HashMap();
-
-	for (String s : kv.split(splitter)) {
-	    String[] foo = s.split("=");
-	    ret.put(foo[0], foo[1]); 
-	}
-	return ret;
+	BluetoothDevice dev = bluetoothAdapter.getRemoteDevice(mac.toString());
+	startIpCamActivity(dev, data[5]);
     }
 
-    private String calculateKey(String in) {
-	MessageDigest md5Hash = null;
-	try {
-	    md5Hash = MessageDigest.getInstance("MD5");
-	} catch (NoSuchAlgorithmException e) {
- 	    Log.d(msg, "Exception while encrypting to md5");
-	}
-	byte[] bytes = in.getBytes(StandardCharsets.UTF_8);
-	md5Hash.update(bytes, 0, bytes.length);
-	String ret = Base64.encodeToString(md5Hash.digest(), Base64.DEFAULT);
-	return ret.substring(0, 16);
-    }
-
-    private UUID UUIDfromInt(long uuid) {
-	return new UUID(uuid << 32 | 0x1000 , 0x800000805f9b34fbL);
-    }
-    
-    // GATT callbacks
-    private class GattClientCallback extends BluetoothGattCallback {
-	private String multimsg;
-
-	public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
-	    Log.d(msg, "onConnectionStateChange() status = " + status + ", newState = " + newState);
-	    if (status == BluetoothGatt.GATT_SUCCESS && newState == BluetoothProfile.STATE_CONNECTED) {
-		setStatus("Connected to " + gatt.getDevice().getName());
-		connected = true;
-		if (!gatt.discoverServices())
-		    setStatus("Falied to start service discovery");
-	    } else {		
-		disconnectDevice();
-	    }
-	}
-	
-	public void onServicesDiscovered(BluetoothGatt gatt, int status) {
-	    Log.d(msg, "onServicesDiscovered()");
-	    
-	    if (status != BluetoothGatt.GATT_SUCCESS) {
-		setStatus("Failed to discover services");
-		disconnectDevice();
-		return;
-	    }
-	    // get the IPCam service
-	    //	    ipcamService = gatt.getService(UUID.fromString("0000d001-0000-1000-8000-00805f9b34fb"));
-	    ipcamService = gatt.getService(UUIDfromInt(0xd001));
-	    if (ipcamService == null) {
-		setStatus(gatt.getDevice().getName() + " does not support the IPCam GATT service");
-		disconnectDevice();
-		return;
-		
-	    }
-
-	    setStatus("IPcam GATT service found");
-	    notifications(true);
-	    getLock();
-	}
-
-	public void onCharacteristicRead (BluetoothGatt gatt, BluetoothGattCharacteristic c, int status) {
-	    int code = (int)(c.getUuid().getMostSignificantBits() >> 32);
-	    String val = c.getStringValue(0);
-	    Map<String,String> kv = splitKV(val, ";");
-
-	    Log.d(msg, c.getUuid().toString() + " returned " + val);
-	    
-	    switch (code) {
-	    case 0xa001: // challenge
-		// already unlocked? 
-		if (kv.get("M").equals("0")) {
-		    setLocked(false);
-		    break;
-		}
-
-		setStatus("Unlocking " + gatt.getDevice().getName() + " usin pincode " + pincode);
-		String key = calculateKey(gatt.getDevice().getName() + pincode + kv.get("C"));
-		doUnlock(key);
-		break;
-	    case 0xa100:
-		// starting a new sequence?
-		if (kv.get("P").equals("1"))
-		    multimsg = "";
-		multimsg += val.split(";",3)[2];
-		// repeat until result is complete
-		if (!kv.get("N").equals(kv.get("P")))
-		    readChar(0xa100);
-		else
-		    selectNetwork(multimsg.split("&"));
-		break;
-	    case 0xa101: // wificonfig
-		displayWifiConfig(kv);
-		break;
-	    case 0xa103: // wifilink
-		wifilink = kv.get("S").equals("1");
-		break;
-	    case 0xa104: // ipconfig
-		displayIpConfig(kv);
-		break;
-	    case 0xa200: // sysinfo
-		displaySysInfo(kv);
-		break;
-	    default:
-		Log.d(msg, "Read unhandled characteristic: " + c.getUuid().toString());
-	    }
-
-	    runQueues();
-	}
-	
-	public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic c) {
-	    Log.d(msg, c.getUuid().toString() + " changed to " + c.getStringValue(0));
-	}
-
-	public void onCharacteristicWrite (BluetoothGatt gatt, BluetoothGattCharacteristic c, int status) {
-	    int code = (int)(c.getUuid().getMostSignificantBits() >> 32);
-	    String val = c.getStringValue(0);
-	    Map<String,String> kv = splitKV(val, ";");
-	    
-	    Log.d(msg, "Write to " + c.getUuid().toString() + " status=" + status + ", value is now: " + val);
-	    
-	    switch (code) {
-	    case 0xa001:
-		if (kv.get("M").equals("0"))
-		    setLocked(false);
-		else
-		    setStatus("Unlocking failed - Wrong PIN Code?");
-		break;
-	    default:
-		Log.d(msg, "No action defined after " + c.getUuid().toString());
-	    }
-	    runQueues();
-	}
-    }
     
     private void setStatus(String text) {
 	Log.d(msg, "Status: " + text);
 	runOnUiThread(new Runnable() {
 		@Override
 		public void run() {
-		    TextView status = (TextView) findViewById(R.id.statustext);
+		    TextView status = (TextView) findViewById(R.id.mainstatus);
 		    status.setText(text);
 		}
 	    });
     }
 
-/*
-05-31 21:26:58.866 26309 26345 D Defogger MainActivity: : 0000a104-0000-1000-8000-00805f9b34fb returned I=192.168.2.37;N=255.255.255.0;G=192.168.2.1;D=148.122.16.253
-05-31 21:27:13.761 26309 26345 D Defogger MainActivity: : 0000a200-0000-1000-8000-00805f9b34fb returned N=DCS-8000LH;P=1;T=1559330833;Z=UTC;F=2.02.02;H=A1;M=B0C5544CCC73;V=0.02
-05-31 21:27:18.618 26309 26345 D Defogger MainActivity: : 0000a103-0000-1000-8000-00805f9b34fb returned S=1
-*/
-    
-    private void displayWifiConfig(Map<String,String> kv) {
-	Log.d(msg, "displayWifiConfig()");
-	runOnUiThread(new Runnable() {
-		@Override
-		public void run() {
-		    // TextView status = (TextView) findViewById(R.id.statustext);
-		    //status.setText(text);
-		}
-	    });
-    }
-
-    private void displayIpConfig(Map<String,String> kv) {
-	Log.d(msg, "displayIpConfig()");
-	runOnUiThread(new Runnable() {
-		@Override
-		public void run() {
-		    TextView t = (TextView) findViewById(R.id.ipaddress);
-		    t.setText(kv.get("I"));
-		    t = (TextView) findViewById(R.id.netmask);
-		    t.setText(kv.get("N"));
-		    t = (TextView)findViewById(R.id.gateway);
-		    t.setText(kv.get("G"));
-		    t = (TextView)findViewById(R.id.dns);
-		    t.setText(kv.get("D"));
-		}
-	    });
-    }
-
-    private void displaySysInfo(Map<String,String> kv) {
-	Log.d(msg, "displaySysInfo()");
-	java.text.DateFormat dateFormat = android.text.format.DateFormat.getTimeFormat(getApplicationContext());
-	
-	runOnUiThread(new Runnable() {
-		@Override
-		public void run() {
-		    TextView t = (TextView) findViewById(R.id.sysname);
-		    t.setText(kv.get("N"));
-		    t = (TextView) findViewById(R.id.systime);
-		    t.setText(dateFormat.format(new Date(1000 * Integer.parseInt(kv.get("T"))))); // milliseconds....
-		    t = (TextView)findViewById(R.id.version);
-		    t.setText("FW Ver: " + kv.get("F") + ", HW Ver: " + kv.get("H") + ", MyDlink Ver: " + kv.get("V"));
-		    t = (TextView)findViewById(R.id.macaddress);
-		    t.setText(kv.get("M"));
-		}
-	    });
-    }
-
-    private class NetAdapter extends ArrayAdapter<String> {
-	private int res;
-	
-	public NetAdapter(Context context, int resource, String[] networks) {
-	    super(context, resource, networks);
-	    res = resource;
-	}
-	
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-	    //L=I=aaaa7,M=0,C=4,S=4,E=2,P=100
-	    // Get the data item for this position
-	    Map<String,String> net = splitKV(getItem(position).substring(2), ",");
-	    
-	    // Check if an existing view is being reused, otherwise inflate the view
-	    if (convertView == null) {
-		convertView = LayoutInflater.from(getContext()).inflate(res, parent, false);
-	    }
-	    
-	    // Lookup view for data population
-	    TextView ssid = (TextView) convertView.findViewById(R.id.ssid);
-	    TextView channel = (TextView) convertView.findViewById(R.id.channel);
-	    TextView key_mgmt = (TextView) convertView.findViewById(R.id.key_mgmt);
-	    TextView proto = (TextView) convertView.findViewById(R.id.proto);
-	    TextView rssi = (TextView) convertView.findViewById(R.id.rssi);
-
-	    // Populate the data into the template view using the data object
-	    ssid.setText(net.get("I"));
-	    channel.setText(net.get("C"));
-	    key_mgmt.setText(net.get("S"));
-	    proto.setText(net.get("E"));
-	    rssi.setText(net.get("P"));
-
-	    // Return the completed view to render on screen
-	    return convertView;
-	}
-    }
-    
-    private void selectNetwork(String[] networks) {
-	Context ctx = this;
-	Log.d(msg, "displayWifiConfig()");
-	runOnUiThread(new Runnable() {
-		@Override
-		public void run() {
-		    ArrayAdapter<String> itemsAdapter = new NetAdapter(ctx, R.layout.item_net, networks);
-		    ListView listView = (ListView) findViewById(R.id.networks);
-		    listView.setAdapter(itemsAdapter);
-		}
-	    });
-    }
-	
-    private void connectDevice(BluetoothDevice device) {
-	Log.d(msg, "connectDevice() " + device.getAddress());
-
-	// create queues
-	readQ = new ArrayDeque();
-	writeQ = new ArrayDeque();
-	
-	// reset status to default
-	connected = false;
-	locked = true;
-	wifilink = false;
-	
-	setStatus("Connecting to '" + device.getName() + "' (" + device.getAddress() + ")");
-	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;
-	locked = true;
-	wifilink = false;
-
-	if (mGatt == null)
-	    return;
-	Log.d(msg, "disconnectDevice() " + mGatt.getDevice().getAddress());
-	mGatt.close();
-    }
-
-    // camera specific code
-    private void setLocked(boolean lock) {
-	if (lock == locked)
-	    return;
-	
-	locked = lock;
- 	setStatus(mGatt.getDevice().getName() + " is " + (lock ? "locked" : "unlocked"));
-	if (locked)
-	    return;
-
-	/* collect current config after unlocking */
-	View v = new View(this);
-	getWifiConfig(v);
-	getWifiLink(v);
-	getIpConfig(v);
-	getSysInfo(v);
-	doWifiScan(v);
-    }
-
-    private void notifications(boolean enable) {
-	if (!connected)
-	    return;
-	Log.d(msg, "notifications()");
-	BluetoothGattCharacteristic c = ipcamService.getCharacteristic(UUIDfromInt(0xa000));
-	if (!mGatt.setCharacteristicNotification(c, enable))
-	    Log.d(msg, "failed to enable notifications");
-    }
-    
-    private void getLock() {
-	if (!locked) {
-	    Log.d(msg, "getLock() already unlocked");
-	    return;
-	}
-	BluetoothGattCharacteristic c = ipcamService.getCharacteristic(UUIDfromInt(0xa001));
-	mGatt.readCharacteristic(c);
-    }
-
-    private void doUnlock(String key) {
-	if (!connected)
-	    return;
-	Log.d(msg, "doUnlock(), key is " + key);
-	BluetoothGattCharacteristic c = ipcamService.getCharacteristic(UUIDfromInt(0xa001));
-	c.setValue("M=0;K=" + key); 
-	mGatt.writeCharacteristic(c);
-    }
-
-    private BluetoothGattCharacteristic runQueues() {
-	BluetoothGattCharacteristic c = readQ.peekFirst();
-	if (c != null && mGatt.readCharacteristic(c))
-	    return readQ.removeFirst();
-	c = writeQ.peekFirst();
-	if (c != null && mGatt.writeCharacteristic(c))
-	    return writeQ.removeFirst();
-	return null;
-    }
-
-    private void readChar(int num) {
-	if (!connected)
-	    return;
-	BluetoothGattCharacteristic c = ipcamService.getCharacteristic(UUIDfromInt(num));
- 	if (locked) {
-	    Log.d(msg, "camera is locked");
-	    readQ.offer(c);
-	    return;
-	}
-
-	Log.d(msg, "reading " + String.format("%#06x", num));
-	if (!mGatt.readCharacteristic(c))
-	    readQ.offer(c);
-    }
-
-    private void writeChar(int num, String val) {
-	if (!connected)
-	    return;
-	BluetoothGattCharacteristic c = ipcamService.getCharacteristic(UUIDfromInt(num));
-	c.setValue(val);
- 	if (locked) {
-	    Log.d(msg, "camera is locked");
-	    writeQ.offer(c);
- 	    return;
-	}
-	Log.d(msg, "writing '" + val + "' to " + String.format("%#06x", num));
-	if (!mGatt.writeCharacteristic(c))
-	    writeQ.offer(c);
-    }
-
-    public void doWifiScan(View view) {
-	readChar(0xa100);
-    }
-
-    public void getWifiConfig(View view) {
-	readChar(0xa101);
-    }
-
-    public void getWifiLink(View view) {
-	readChar(0xa103);
-    }
-
-    public void getIpConfig(View view) {
-	readChar(0xa104);
-    }
-
-    public void getSysInfo(View view) {
-	readChar(0xa200);
-    }
-
-    /*
-    private void setWifi(String essid, String passwd) {
-	if (wifiScanResults == null) {
-	    doWifiScan(gatt);
-	    return;
-	}
-	    
-	writeChar(0xa101, "P=;N=" + pincode);
-    }
-    */
-    
-    private void setInitialPassword() {
-	writeChar(0xa201, "P=;N=" + pincode);
-    }
-    
-    private void runCommand(String command) {
-	writeChar(0xa201, "P=" + pincode + ";N=" + pincode + "&&(" + command + ")&");
-    }
 }