From 74c7285f8158fa18d87e79a45b7cfb54b2c03f78 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 31 Aug 2021 08:40:55 +0200
Subject: [PATCH] Made keyword management free

---
 README.md                                               | 1 -
 app/src/main/java/eu/faircode/email/AdapterKeyword.java | 4 ----
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 4 ----
 metadata/en-US/full_description.txt                     | 1 -
 4 files changed, 10 deletions(-)

diff --git a/README.md b/README.md
index a2685b67d5..c3b584c09b 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,6 @@ All pro features are convenience or advanced features.
 * Filter rules ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq71))
 * Automatic message classification ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq163))
 * Search indexing, search on server ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq13))
-* Keyword management
 * S/MIME sign/encrypt ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq12))
 * Biometric/PIN authentication ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq113))
 * Message list widget
diff --git a/app/src/main/java/eu/faircode/email/AdapterKeyword.java b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
index 7842cae4d1..3f42e7a657 100644
--- a/app/src/main/java/eu/faircode/email/AdapterKeyword.java
+++ b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
@@ -54,7 +54,6 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
     private LifecycleOwner owner;
     private LayoutInflater inflater;
     private SharedPreferences prefs;
-    private boolean pro;
 
     private long id;
     private List<TupleKeyword> all = new ArrayList<>();
@@ -99,9 +98,7 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
         private void bindTo(TupleKeyword keyword) {
             cbKeyword.setText(getTitle(keyword.name));
             cbKeyword.setChecked(keyword.selected);
-            cbKeyword.setEnabled(pro);
             btnColor.setColor(keyword.color);
-            btnColor.setEnabled(pro);
             grpNotEdit.setVisibility(View.VISIBLE);
             grpEdit.setVisibility(View.GONE);
         }
@@ -242,7 +239,6 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
         this.owner = owner;
         this.inflater = LayoutInflater.from(context);
         this.prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        this.pro = ActivityBilling.isPro(context);
 
         setHasStableIds(false);
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d16548b63a..5a01f61cc5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -7007,7 +7007,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_keyword_manage, null);
             final RecyclerView rvKeyword = dview.findViewById(R.id.rvKeyword);
-            final TextView tvPro = dview.findViewById(R.id.tvPro);
             final FloatingActionButton fabAdd = dview.findViewById(R.id.fabAdd);
             final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
 
@@ -7018,9 +7017,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             final AdapterKeyword adapter = new AdapterKeyword(getContext(), getViewLifecycleOwner());
             rvKeyword.setAdapter(adapter);
 
-            Helper.linkPro(tvPro);
-
-            fabAdd.setEnabled(ActivityBilling.isPro(getContext()));
             fabAdd.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
index 542d95c107..e33d384c6a 100644
--- a/metadata/en-US/full_description.txt
+++ b/metadata/en-US/full_description.txt
@@ -83,7 +83,6 @@ All pro features are convenience or advanced features.
 * Filter rules
 * Automatic message classification
 * Search indexing, search on server
-* Keyword management
 * S/MIME sign/encrypt
 * Biometric/PIN authentication
 * Message list widget