From b98287e68a5e937459ba0e92729a59ef858589ab Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 30 Mar 2019 18:34:53 +0100
Subject: [PATCH] Cleanup

---
 .../java/eu/faircode/email/FragmentAccount.java     |  8 --------
 app/src/main/res/layout/fragment_account.xml        | 13 +------------
 app/src/main/res/values/strings.xml                 |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 5c5b7bfc91..6560b65a8f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -119,7 +119,6 @@ public class FragmentAccount extends FragmentBase {
     private Button btnCheck;
     private ContentLoadingProgressBar pbCheck;
     private TextView tvIdle;
-    private TextView tvMove;
     private TextView tvUtf8;
 
     private ArrayAdapter<EntityFolder> adapter;
@@ -196,7 +195,6 @@ public class FragmentAccount extends FragmentBase {
         pbCheck = view.findViewById(R.id.pbCheck);
 
         tvIdle = view.findViewById(R.id.tvIdle);
-        tvMove = view.findViewById(R.id.tvMove);
         tvUtf8 = view.findViewById(R.id.tvUtf8);
 
         spDrafts = view.findViewById(R.id.spDrafts);
@@ -235,7 +233,6 @@ public class FragmentAccount extends FragmentBase {
 
                 btnCheck.setVisibility(position > 0 ? View.VISIBLE : View.GONE);
                 tvIdle.setVisibility(View.GONE);
-                tvMove.setVisibility(View.GONE);
                 tvUtf8.setVisibility(View.GONE);
 
                 Object tag = adapterView.getTag();
@@ -440,7 +437,6 @@ public class FragmentAccount extends FragmentBase {
         btnAdvanced.setVisibility(View.GONE);
 
         tvIdle.setVisibility(View.GONE);
-        tvMove.setVisibility(View.GONE);
         tvUtf8.setVisibility(View.GONE);
 
         btnCheck.setVisibility(View.GONE);
@@ -518,7 +514,6 @@ public class FragmentAccount extends FragmentBase {
                 Helper.setViewsEnabled(view, false);
                 pbCheck.setVisibility(View.VISIBLE);
                 tvIdle.setVisibility(View.GONE);
-                tvMove.setVisibility(View.GONE);
                 tvUtf8.setVisibility(View.GONE);
                 grpFolders.setVisibility(View.GONE);
                 tvError.setVisibility(View.GONE);
@@ -578,7 +573,6 @@ public class FragmentAccount extends FragmentBase {
                     }
 
                     result.idle = ((IMAPStore) istore).hasCapability("IDLE");
-                    result.move = ((IMAPStore) istore).hasCapability("MOVE");
 
                     boolean inbox = false;
                     boolean archive = false;
@@ -678,7 +672,6 @@ public class FragmentAccount extends FragmentBase {
             @Override
             protected void onExecuted(Bundle args, CheckResult result) {
                 tvIdle.setVisibility(result.idle ? View.GONE : View.VISIBLE);
-                tvMove.setVisibility(result.move ? View.GONE : View.VISIBLE);
                 tvUtf8.setVisibility(result.utf8 == null || result.utf8 ? View.GONE : View.VISIBLE);
 
                 setFolders(result.folders, result.account);
@@ -1447,7 +1440,6 @@ public class FragmentAccount extends FragmentBase {
         EntityAccount account;
         List<EntityFolder> folders;
         boolean idle;
-        boolean move;
         Boolean utf8;
     }
 }
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 8453c402ab..af9c8d55b9 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -471,17 +471,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/btnCheck" />
 
-        <TextView
-            android:id="@+id/tvMove"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_no_move"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvIdle" />
-
         <TextView
             android:id="@+id/tvUtf8"
             android:layout_width="wrap_content"
@@ -491,7 +480,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvMove" />
+            app:layout_constraintTop_toBottomOf="@+id/tvIdle" />
 
         <TextView
             android:id="@+id/tvDrafts"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76c5084861..2946a83fa1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -268,7 +268,6 @@
     <string name="title_no_inbox">Inbox not found</string>
     <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
     <string name="title_no_idle">This provider does not support push messages. This will delay reception of new messages and increase battery usage.</string>
-    <string name="title_no_move">This provider does not support MOVE</string>
     <string name="title_no_utf8">This provider does not support UTF-8</string>
     <string name="title_no_sync">Synchronization errors since %1$s</string>
     <string name="title_sync_errors">Synchronizing some folders failed</string>