diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-30 12:05:33 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-30 12:05:33 +0200 |
commit | 058f9ba7650927d755cf408027dd19f78c92b7c2 (patch) | |
tree | f1815ffb75bec6e6d92f1e4566f151ba3caa4f14 /same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java | |
parent | d87e94e9765c33ccf49d4743d2e4be94d65a5e76 (diff) |
Add "kill master" button.
Diffstat (limited to 'same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java')
-rw-r--r-- | same-android/src/main/java/com/orbekk/same/android/SameControllerActivity.java | 13 |
1 files changed, 11 insertions, 2 deletions
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"); |