From 058f9ba7650927d755cf408027dd19f78c92b7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 30 Apr 2012 12:05:33 +0200
Subject: Add "kill master" button.

---
 same-android/res/layout/controller.xml                     | 14 +++++++-------
 .../com/orbekk/same/android/SameControllerActivity.java    | 13 +++++++++++--
 .../src/main/java/com/orbekk/same/android/SameService.java |  7 ++++++-
 3 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'same-android')

diff --git a/same-android/res/layout/controller.xml b/same-android/res/layout/controller.xml
index 79974ee..1acaa01 100644
--- a/same-android/res/layout/controller.xml
+++ b/same-android/res/layout/controller.xml
@@ -7,12 +7,6 @@
     android:focusableInTouchMode="true"
     android:id="@+id/container_layout">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Commands"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -41,7 +35,13 @@
         android:layout_height="wrap_content"
         android:onClick="joinNetworkUrl"
         android:text="Join" />
-
+    
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="killMaster"
+        android:text="Kill master" />
+    
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java
index 6e8d613..c0f60f8 100644
--- a/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java
@@ -63,8 +63,7 @@ public class SameControllerActivity extends Activity {
         @Override
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
             String networkName = networkNames.get(position);
-            int networkIndex = networkNames.indexOf(networkName);
-            String masterUrl = networkUrls.get(networkIndex);
+            String masterUrl = networkUrls.get(position);
             joinNetwork(masterUrl);      
         }
     };
@@ -87,6 +86,16 @@ public class SameControllerActivity extends Activity {
         }
     }
     
+    public void killMaster(View unused) {
+        Message message = Message.obtain(null, SameService.KILL_MASTER);
+        try {
+            sameService.send(message);
+        } catch (RemoteException e) {
+            logger.error("Failed to kill master", e);
+            throw new RuntimeException(e);
+        }
+    }
+    
     public void joinNetworkUrl(View unused) {
         Intent intent = new Intent(this, SameService.class);
         intent.setAction("join");
diff --git a/same-android/src/main/java/com/orbekk/same/android/SameService.java b/same-android/src/main/java/com/orbekk/same/android/SameService.java
index 559b521..c9ff39b 100644
--- a/same-android/src/main/java/com/orbekk/same/android/SameService.java
+++ b/same-android/src/main/java/com/orbekk/same/android/SameService.java
@@ -40,7 +40,7 @@ public class SameService extends Service {
     public final static int JOIN_NETWORK = 4;
     public final static int ADD_STATE_RECEIVER = 5;
     public final static int REMOVE_STATE_RECEIVER = 6;
-    
+
     /**
      * arg1: Operation number.
      * bundle: A Bundle created with ComponentBundle
@@ -58,6 +58,8 @@ public class SameService extends Service {
      * obj: Status message.
      */
     public final static int OPERATION_STATUS_CALLBACK = 9;
+
+    public final static int KILL_MASTER = 10;
     
     // TODO: Remove these and use messengers instead of broadcast intents.
     public final static String AVAILABLE_NETWORKS_UPDATE =
@@ -137,6 +139,9 @@ public class SameService extends Service {
                     operationStatusCallback(op, id, message.replyTo);
                     logger.info("Callback sent.");
                     break;
+                case KILL_MASTER:
+                    logger.info("Kill master.");
+                    sameController.killMaster();
                 default:
                     super.handleMessage(message);
             }
-- 
cgit v1.2.3