From 43438e0f21d6db84f04b2ffa5697326b5200aeec Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 5 Jan 2021 19:12:24 +0100
Subject: [PATCH] Auto classify is a free feature

---
 .../main/java/eu/faircode/email/FragmentFolder.java  |  8 --------
 .../java/eu/faircode/email/MessageClassifier.java    |  3 +--
 app/src/main/res/layout/fragment_folder.xml          | 12 +-----------
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 7b918c2cd6..f431aa60d6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -70,7 +70,6 @@ public class FragmentFolder extends FragmentBase {
     private TextView tvPoll;
     private CheckBox cbDownload;
     private CheckBox cbAutoClassify;
-    private TextView tvAutoClassifyPro;
     private Button btnInfo;
     private EditText etSyncDays;
     private EditText etKeepDays;
@@ -132,7 +131,6 @@ public class FragmentFolder extends FragmentBase {
         tvPoll = view.findViewById(R.id.tvPoll);
         cbDownload = view.findViewById(R.id.cbDownload);
         cbAutoClassify = view.findViewById(R.id.cbAutoClassify);
-        tvAutoClassifyPro = view.findViewById(R.id.tvAutoClassifyPro);
         btnInfo = view.findViewById(R.id.btnInfo);
         etSyncDays = view.findViewById(R.id.etSyncDays);
         etKeepDays = view.findViewById(R.id.etKeepDays);
@@ -179,8 +177,6 @@ public class FragmentFolder extends FragmentBase {
             }
         });
 
-        Helper.linkPro(tvAutoClassifyPro);
-
         btnInfo.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -222,7 +218,6 @@ public class FragmentFolder extends FragmentBase {
         tvParent.setText(parent);
         grpParent.setVisibility(parent == null ? View.GONE : View.VISIBLE);
         cbAutoClassify.setVisibility(View.GONE);
-        tvAutoClassifyPro.setVisibility(View.GONE);
         grpAutoDelete.setVisibility(View.GONE);
         btnSave.setEnabled(false);
         pbSave.setVisibility(View.GONE);
@@ -308,16 +303,13 @@ public class FragmentFolder extends FragmentBase {
                 boolean canAutoClassify = (imap &&
                         MessageClassifier.isEnabled(getContext()) &&
                         (folder == null || MessageClassifier.canClassify(folder.type)));
-                boolean isJunk = (folder != null && EntityFolder.JUNK.equals(folder.type));
 
                 etName.setEnabled(folder == null || EntityFolder.USER.equals(folder.type));
                 cbPoll.setEnabled(cbSynchronize.isChecked() && always);
                 etPoll.setEnabled(cbSynchronize.isChecked() && always);
                 tvPoll.setEnabled(cbSynchronize.isChecked() && always);
                 grpPoll.setVisibility(imap && cbPoll.isEnabled() && cbPoll.isChecked() ? View.VISIBLE : View.GONE);
-                cbAutoClassify.setEnabled(canAutoClassify && (isJunk || ActivityBilling.isPro(getContext())));
                 cbAutoClassify.setVisibility(canAutoClassify ? View.VISIBLE : View.GONE);
-                tvAutoClassifyPro.setVisibility(canAutoClassify && !cbAutoClassify.isEnabled() ? View.VISIBLE : View.GONE);
                 etKeepDays.setEnabled(!cbKeepAll.isChecked());
                 cbAutoDelete.setEnabled(!cbKeepAll.isChecked());
                 cbAutoDelete.setText(folder != null && EntityFolder.TRASH.equals(folder.type)
diff --git a/app/src/main/java/eu/faircode/email/MessageClassifier.java b/app/src/main/java/eu/faircode/email/MessageClassifier.java
index eaf587a0f5..eaef81377b 100644
--- a/app/src/main/java/eu/faircode/email/MessageClassifier.java
+++ b/app/src/main/java/eu/faircode/email/MessageClassifier.java
@@ -148,8 +148,7 @@ public class MessageClassifier {
                     EntityFolder target = db.folder().getFolderByName(account.id, classified);
                     if (target != null && target.auto_classify &&
                             !target.id.equals(folder.id) &&
-                            !EntityFolder.JUNK.equals(folder.type) &&
-                            (EntityFolder.JUNK.equals(target.type) || ActivityBilling.isPro(context))) {
+                            !EntityFolder.JUNK.equals(folder.type)) {
 
                         EntityOperation.queue(context, message, EntityOperation.MOVE, target.id, false, true);
                         message.ui_hide = true;
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 929140c07d..b8eb71efe7 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -206,16 +206,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbDownload" />
 
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvAutoClassifyPro"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_pro_feature"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:attr/textColorLink"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbAutoClassify" />
-
         <!-- after -->
 
         <eu.faircode.email.FixedTextView
@@ -226,7 +216,7 @@
             android:text="@string/title_sync_days"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAutoClassifyPro" />
+            app:layout_constraintTop_toBottomOf="@id/cbAutoClassify" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSyncDaysRemark"