From 138d564064f2a87f0f839a18391991571298b56d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 14 Jul 2022 21:37:03 +0200
Subject: [PATCH] Cleanup

---
 .../java/eu/faircode/email/FragmentOAuth.java     |  6 ------
 app/src/main/res/layout/fragment_gmail.xml        | 15 ++-------------
 app/src/main/res/layout/fragment_oauth.xml        | 13 +------------
 app/src/main/res/values/strings.xml               |  1 -
 4 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 5cc52acf97..615fae201d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -124,7 +124,6 @@ public class FragmentOAuth extends FragmentBase {
     private TextView tvGmailHint;
 
     private TextView tvError;
-    private TextView tvGmailDraftsHint;
     private TextView tvOfficeAuthHint;
     private Button btnSupport;
     private Button btnHelp;
@@ -175,7 +174,6 @@ public class FragmentOAuth extends FragmentBase {
         tvGmailHint = view.findViewById(R.id.tvGmailHint);
 
         tvError = view.findViewById(R.id.tvError);
-        tvGmailDraftsHint = view.findViewById(R.id.tvGmailDraftsHint);
         tvOfficeAuthHint = view.findViewById(R.id.tvOfficeAuthHint);
         btnSupport = view.findViewById(R.id.btnSupport);
         btnHelp = view.findViewById(R.id.btnHelp);
@@ -967,9 +965,6 @@ public class FragmentOAuth extends FragmentBase {
 
         grpError.setVisibility(View.VISIBLE);
 
-        if ("gmail".equals(id))
-            tvGmailDraftsHint.setVisibility(View.VISIBLE);
-
         if ("office365".equals(id) || "outlook".equals(id)) {
             if (ex instanceof AuthenticationFailedException)
                 tvOfficeAuthHint.setVisibility(View.VISIBLE);
@@ -1007,7 +1002,6 @@ public class FragmentOAuth extends FragmentBase {
     private void hideError() {
         btnHelp.setVisibility(View.GONE);
         grpError.setVisibility(View.GONE);
-        tvGmailDraftsHint.setVisibility(View.GONE);
         tvOfficeAuthHint.setVisibility(View.GONE);
     }
 }
diff --git a/app/src/main/res/layout/fragment_gmail.xml b/app/src/main/res/layout/fragment_gmail.xml
index b4bdb88392..9f321c9916 100644
--- a/app/src/main/res/layout/fragment_gmail.xml
+++ b/app/src/main/res/layout/fragment_gmail.xml
@@ -191,17 +191,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvErrorTitle" />
 
-        <TextView
-            android:id="@+id/tvDraftsHint"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_setup_gmail_drafts"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvError" />
-
         <Button
             android:id="@+id/btnSupport"
             android:layout_width="wrap_content"
@@ -215,12 +204,12 @@
             android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvDraftsHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvError" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpError"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvErrorTitle,tvError,tvDraftsHint,btnSupport" />
+            app:constraint_referenced_ids="tvErrorTitle,tvError,btnSupport" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/layout/fragment_oauth.xml b/app/src/main/res/layout/fragment_oauth.xml
index c9f1c3aab7..071547281b 100644
--- a/app/src/main/res/layout/fragment_oauth.xml
+++ b/app/src/main/res/layout/fragment_oauth.xml
@@ -187,17 +187,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvErrorTitle" />
 
-        <TextView
-            android:id="@+id/tvGmailDraftsHint"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_setup_gmail_drafts"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvError" />
-
         <TextView
             android:id="@+id/tvOfficeAuthHint"
             android:layout_width="wrap_content"
@@ -207,7 +196,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvGmailDraftsHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvError" />
 
         <Button
             android:id="@+id/btnSupport"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 472a7a44ab..b5228540ac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -211,7 +211,6 @@
     <string name="title_setup_gmail_support">Authorizing Google accounts will work in the Play Store and GitHub version only because Android checks the digital app signature</string>
     <string name="title_setup_gmail_rationale">Please grant permissions to select an account and read your name</string>
     <string name="title_setup_gmail_permissions">Google will ask for permissions to read, compose, send and permanently delete all your email. FairEmail will never delete your messages without your explicit consent.</string>
-    <string name="title_setup_gmail_drafts">If the drafts folder is not accessible by IMAP, this can be fixed in the Gmail label settings</string>
     <string name="title_setup_gmail_password">I want to authorize an account with a password instead of an on-device account</string>
     <string name="title_setup_office_auth">The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator</string>
     <string name="title_setup_oauth_rationale">Authorize access to your %1$s account</string>