From c4131fc5a4af0fdb11bb9f1782818755e3368bad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 13 Feb 2012 19:49:22 +0100
Subject: Use SameController for network discovery in Android app.

---
 .../java/com/orbekk/SameControllerActivity.java    | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'same-android/src/main/java/com/orbekk/SameControllerActivity.java')

diff --git a/same-android/src/main/java/com/orbekk/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/SameControllerActivity.java
index 9768cdc..c8c1ebd 100644
--- a/same-android/src/main/java/com/orbekk/SameControllerActivity.java
+++ b/same-android/src/main/java/com/orbekk/SameControllerActivity.java
@@ -88,16 +88,19 @@ public class SameControllerActivity extends Activity {
     }
     
     public void searchNetworks(View unused) {
-        Toast.makeText(this, "Discovering networks", Toast.LENGTH_SHORT).show();
-        final String[] listItems = new String[]{"First item", "Second item"};
-        ListView list = (ListView)findViewById(R.id.network_list);
-        list.setAdapter(new ArrayAdapter<String>(this, R.layout.list_text_item,
-                listItems));
+        logger.info("SearchNetworks()");
+//        Toast.makeText(this, "Discovering networks", Toast.LENGTH_SHORT).show();
+//        final String[] listItems = new String[]{"First item", "Second item"};
+//        ListView list = (ListView)findViewById(R.id.network_list);
+//        list.setAdapter(new ArrayAdapter<String>(this, R.layout.list_text_item,
+//                listItems));
         
-        Message message = Message.obtain(null, SameService.DISPLAY_MESSAGE,
-                "Message from Activity!");
+//        Message message = Message.obtain(null, SameService.DISPLAY_MESSAGE,
+//                "Message from Activity!");
+        
+        Message searchMessage = Message.obtain(null, SameService.SEARCH_NETWORKS);
         try {
-            sameService.send(message);
+            sameService.send(searchMessage);
         } catch (RemoteException e) {
             logger.error("Failed to send message", e);
         }
@@ -117,7 +120,7 @@ public class SameControllerActivity extends Activity {
         bindService(intent, sameConnection, Context.BIND_AUTO_CREATE);
     }
     
-    @Override public void onResume() {
+    @Override public void onStart() {
         super.onResume();
         
         IntentFilter sameServiceUpdates = new IntentFilter(
@@ -125,6 +128,13 @@ public class SameControllerActivity extends Activity {
         registerReceiver(broadcastReceiver, sameServiceUpdates);
     }
     
+    @Override public void onStop() {
+        super.onStop();
+        if (sameService != null) {
+            unbindService(sameConnection);
+        }
+    }
+    
     @Override
     protected void onDestroy() {
         super.onDestroy();
-- 
cgit v1.2.3