aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-05-05 18:43:43 +0200
committerChristian S <christian@pix-art.de>2016-05-05 18:43:43 +0200
commit957c8f87932412fac17e09c6a5e002de2ebffb87 (patch)
tree9443ecb690b9576a629e643a9c0906818a1a1560 /src/main
parenta78aeea3103a4471039ded45f475c8d6eeab5b62 (diff)
go directly to the user account via menu
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java6
-rw-r--r--src/main/res/menu/conversations.xml2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index cf821eb08..e54596b0d 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -345,7 +345,11 @@ public abstract class XmppActivity extends Activity {
startActivity(new Intent(this, UpdaterActivity.class));
break;
case R.id.action_accounts:
- startActivity(new Intent(this, ManageAccountActivity.class));
+ final Intent intent = new Intent(getApplicationContext(), EditAccountActivity.class);
+ Account mAccount = xmppConnectionService.getAccounts().get(0);
+ intent.putExtra("jid", mAccount.getJid().toBareJid().toString());
+ intent.putExtra("init", false);
+ startActivity(intent);
break;
case android.R.id.home:
finish();
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 8754f869c..7155b8ce5 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -62,7 +62,7 @@
android:id="@+id/action_accounts"
android:orderInCategory="90"
android:showAsAction="never"
- android:title="@string/action_accounts"/>
+ android:title="@string/mgmt_account_edit"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"