From b4373eb8758e3fbfef6987d4239abfbc579f8b33 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 8 Apr 2018 00:50:29 +0200 Subject: fix menu entries --- src/main/java/de/pixart/messenger/ui/XmppActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/pixart/messenger/ui/XmppActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index 76d6f2fa5..8bfe7d2fa 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -122,6 +122,7 @@ public abstract class XmppActivity extends AppCompatActivity { registerListeners(); registeredListeners = true; } + invalidateOptionsMenu(); onBackendConnected(); } @@ -383,7 +384,7 @@ public abstract class XmppActivity extends AppCompatActivity { startActivity(new Intent(this, SettingsActivity.class)); break; case R.id.action_accounts: - if (xmppConnectionService.getAccounts().size() == 1 && !xmppConnectionService.multipleAccounts()) { + if (xmppConnectionServiceBound && this.xmppConnectionService.getAccounts().size() == 1 && !this.xmppConnectionService.multipleAccounts()) { final Intent intent = new Intent(getApplicationContext(), EditAccountActivity.class); Account mAccount = xmppConnectionService.getAccounts().get(0); intent.putExtra("jid", mAccount.getJid().asBareJid().toString()); -- cgit v1.2.3