From d6dc05fc4f3903285b6f40f9ad53cf94b5f828db Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Wed, 8 Apr 2020 15:08:07 +0200
Subject: [PATCH] comment #423 & #424 - Add account name for the logout

---
 .../java/app/fedilab/android/activities/BaseMainActivity.java   | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 2 files changed, 2 insertions(+), 2 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 add86e957..c911ffa4c 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -935,7 +935,7 @@ public abstract class BaseMainActivity extends BaseActivity
                 switch (item.getItemId()) {
                     case R.id.action_logout_account:
                         AlertDialog.Builder dialogBuilderLogoutAccount = new AlertDialog.Builder(BaseMainActivity.this, style);
-                        dialogBuilderLogoutAccount.setMessage(R.string.logout_account_confirmation);
+                        dialogBuilderLogoutAccount.setMessage(getString(R.string.logout_account_confirmation, account.getUsername(), account.getInstance()));
                         dialogBuilderLogoutAccount.setPositiveButton(R.string.action_logout, (dialog, id) -> {
                             Helper.logoutCurrentUser(BaseMainActivity.this);
                             dialog.dismiss();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 63c721c71..28ee0ba50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,7 +85,7 @@
     <string name="no_emoji">The app did not collect custom emojis for the moment.</string>
     <string name="live_notif">Live notifications</string>
     <string name="logout_confirmation">Are you sure you want to logout?</string>
-    <string name="logout_account_confirmation">Are you sure you want to logout this account?</string>
+    <string name="logout_account_confirmation">Are you sure you want to logout @%1$s@%2$s?</string>
     <!-- Status -->
     <string name="no_status">No toot to display</string>
     <string name="no_stories">No stories to display</string>