From 08e5400be57fad8e18376ad99373d2e39b8c0d7b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 8 May 2021 13:22:01 +0200
Subject: [PATCH] Quick setup titles

---
 app/src/main/java/eu/faircode/email/FragmentGmail.java      | 2 +-
 app/src/main/java/eu/faircode/email/FragmentQuickSetup.java | 2 +-
 app/src/main/java/eu/faircode/email/FragmentSetup.java      | 3 ++-
 app/src/main/res/values/strings.xml                         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java
index 73a60dc2bf..d895471152 100644
--- a/app/src/main/java/eu/faircode/email/FragmentGmail.java
+++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java
@@ -83,7 +83,7 @@ public class FragmentGmail extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setSubtitle(R.string.title_setup_quick);
+        setSubtitle(R.string.title_setup_gmail);
         setHasOptionsMenu(true);
 
         view = (ViewGroup) inflater.inflate(R.layout.fragment_gmail, container, false);
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index b5ac4d7356..fcbc545289 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -86,7 +86,7 @@ public class FragmentQuickSetup extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setSubtitle(R.string.title_setup_quick);
+        setSubtitle(R.string.title_setup_other);
         setHasOptionsMenu(true);
 
         view = (ViewGroup) inflater.inflate(R.layout.fragment_quick_setup, container, false);
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 29c57c949d..7c8f4d363a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -182,7 +182,8 @@ public class FragmentSetup extends FragmentBase {
                 Menu menu = popupMenu.getMenu();
 
                 int order = 1;
-                menu.add(Menu.NONE, R.string.title_setup_gmail, order++, R.string.title_setup_gmail);
+                String gmail = getString(R.string.title_setup_oauth, getString(R.string.title_setup_gmail));
+                menu.add(Menu.NONE, R.string.title_setup_gmail, order++, gmail);
 
                 for (EmailProvider provider : EmailProvider.loadProfiles(context))
                     if (provider.oauth != null &&
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 94b2bae259..5d241b9e10 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -176,7 +176,7 @@
     <string name="title_setup_account_identity_hint">You can configure the name, color and swipe actions in the account settings, and configure a signature in the identity settings</string>
     <string name="title_setup_accounts">Accounts</string>
     <string name="title_setup_identities">Identities</string>
-    <string name="title_setup_gmail" translatable="false">Gmail (OAuth)</string>
+    <string name="title_setup_gmail" translatable="false">Gmail</string>
     <string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string>
     <string name="title_setup_other">Other provider</string>
     <string name="title_setup_pop3">POP3 account</string>