diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-02-10 19:37:57 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-02-10 19:37:57 +0100 |
commit | cf577ea140738b2d7d111f1d0b59636062dcddeb (patch) | |
tree | 079f5588f20cdd9e7a778c9ec211e788431d66e0 /src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java | |
parent | 0f5c0cae1f7e764796e883bf9cc36f0f3f009306 (diff) |
return to welcome activity after deleting last account
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java b/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java index 4a17a4fbc..b253d4021 100644 --- a/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java @@ -338,17 +338,16 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda } private void deleteAccount(final Account account) { - AlertDialog.Builder builder = new AlertDialog.Builder( - ManageAccountActivity.this); + AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.mgmt_account_are_you_sure)); builder.setIconAttribute(android.R.attr.alertDialogIcon); builder.setMessage(getString(R.string.mgmt_account_delete_confirm_text)); builder.setPositiveButton(getString(R.string.delete), - new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - xmppConnectionService.deleteAccount(account); - selectedAccount = null; + (dialog, which) -> { + xmppConnectionService.deleteAccount(account); + selectedAccount = null; + if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) { + WelcomeActivity.launch(this); } }); builder.setNegativeButton(getString(R.string.cancel), null); @@ -386,16 +385,14 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda @Override public void onAccountCreated(Account account) { - switchToAccount(account, true); + Intent intent = new Intent(this, EditAccountActivity.class); + intent.putExtra("jid", account.getJid().toBareJid().toString()); + intent.putExtra("init", true); + startActivity(intent); } @Override public void informUser(final int r) { - runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(ManageAccountActivity.this, r, Toast.LENGTH_LONG).show(); - } - }); + runOnUiThread(() -> Toast.makeText(ManageAccountActivity.this, r, Toast.LENGTH_LONG).show()); } } |