From 47d8d43d49ff4bb604bb26fe1285dcf156d218fd Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Tue, 20 Apr 2010 20:45:34 +0200 Subject: [PATCH] ServersActivity: added "exit" to the menu --- res/menu/servers.xml | 4 ++++ res/values/strings.xml | 1 + src/org/yaaic/activity/ServersActivity.java | 12 ++++++++++++ 3 files changed, 17 insertions(+) diff --git a/res/menu/servers.xml b/res/menu/servers.xml index eb8f3a6..c9b3457 100644 --- a/res/menu/servers.xml +++ b/res/menu/servers.xml @@ -32,4 +32,8 @@ along with Yaaic. If not, see . android:id="@+id/about" android:title="@string/about_menu" android:icon="@android:drawable/ic_menu_help" /> + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index dde54c0..b625c0b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3,6 +3,7 @@ Add server Settings About + Exit Add new server Title diff --git a/src/org/yaaic/activity/ServersActivity.java b/src/org/yaaic/activity/ServersActivity.java index 7250a43..d5b276b 100644 --- a/src/org/yaaic/activity/ServersActivity.java +++ b/src/org/yaaic/activity/ServersActivity.java @@ -20,6 +20,8 @@ along with Yaaic. If not, see . */ package org.yaaic.activity; +import java.util.ArrayList; + import android.app.AlertDialog; import android.app.ListActivity; import android.content.ComponentName; @@ -242,6 +244,16 @@ public class ServersActivity extends ListActivity implements ServiceConnection, case R.id.settings: startActivity(new Intent(this, SettingsActivity.class)); break; + case R.id.exit: + ArrayList mServers = Yaaic.getInstance().getServersAsArrayList(); + for (Server server : mServers) { + if (binder.getService().hasConnection(server.getId())) { + binder.getService().getConnection(server.getId()).quitServer(); + } + } + // ugly + binder.getService().stopForegroundCompat(R.string.app_name); + finish(); } return true;