From 61d9fc53b0aa31a8dc968b119eed7748ac6c9df5 Mon Sep 17 00:00:00 2001 From: Kasun Date: Mon, 10 Feb 2020 21:30:08 +0530 Subject: [PATCH] ask for confirmation before logout --- .../android/activities/BaseMainActivity.java | 26 +++++++++++++++---- app/src/main/res/values/strings.xml | 1 + 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 56214d394..5d97c1950 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -972,13 +972,29 @@ public abstract class BaseMainActivity extends BaseActivity public boolean onMenuItemClick(MenuItem item) { switch (item.getItemId()) { case R.id.action_logout: - Helper.logout(getApplicationContext()); - Intent myIntent = new Intent(BaseMainActivity.this, LoginActivity.class); - startActivity(myIntent); - finish(); + AlertDialog.Builder dialogBuilderLogout = new AlertDialog.Builder(BaseMainActivity.this, style); + dialogBuilderLogout.setMessage(R.string.logout_confirmation); + dialogBuilderLogout.setPositiveButton(R.string.action_logout, (dialog, id) -> { + Helper.logout(getApplicationContext()); + Intent myIntent = new Intent(BaseMainActivity.this, LoginActivity.class); + startActivity(myIntent); + dialog.dismiss(); + finish(); + }); + dialogBuilderLogout.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss()); + AlertDialog alertDialogLogout = dialogBuilderLogout.create(); + alertDialogLogout.show(); return true; case R.id.action_logout_account: - Helper.logoutCurrentUser(BaseMainActivity.this); + AlertDialog.Builder dialogBuilderLogoutAccount = new AlertDialog.Builder(BaseMainActivity.this, style); + dialogBuilderLogoutAccount.setMessage(R.string.logout_confirmation); + dialogBuilderLogoutAccount.setPositiveButton(R.string.action_logout, (dialog, id) -> { + Helper.logoutCurrentUser(BaseMainActivity.this); + dialog.dismiss(); + }); + dialogBuilderLogoutAccount.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss()); + AlertDialog alertDialogLogoutAccount = dialogBuilderLogoutAccount.create(); + alertDialogLogoutAccount.show(); return true; case R.id.action_privacy: Intent intent = new Intent(getApplicationContext(), PrivacyActivity.class); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 398be701e..74926c2de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,6 +84,7 @@ Insert emoji The app did not collect custom emojis for the moment. Live notifications + Are you sure you want to logout? No toot to display No stories to display