From aab40f78c099f8958d06613e751a998b6f9dc9b2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 27 Aug 2018 17:05:34 +0000
Subject: [PATCH] Searching is a pro feature

---
 .../eu/faircode/email/FragmentCompose.java    | 10 ++++++--
 .../eu/faircode/email/FragmentMessage.java    | 11 +++++---
 .../eu/faircode/email/FragmentMessages.java   | 25 ++++++++++++-------
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f565b459..47571220 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -430,9 +430,15 @@ public class FragmentCompose extends FragmentEx {
 
     private void onMenuEncrypt() {
         Log.i(Helper.TAG, "On encrypt");
+
+        if (!PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("pro", false)) {
+            FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+            fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
+            fragmentTransaction.commit();
+            return;
+        }
+
         try {
-            if (!PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("pro", false))
-                throw new IllegalArgumentException(getString(R.string.title_pro_feature));
 
             if (openPgpConnection == null || !openPgpConnection.isBound())
                 throw new IllegalArgumentException(getString(R.string.title_no_openpgp));
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index 1dc33b02..8957aacd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -793,10 +793,15 @@ public class FragmentMessage extends FragmentEx {
 
     private void onMenuDecrypt() {
         Log.i(Helper.TAG, "On decrypt");
-        try {
-            if (!PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("pro", false))
-                throw new IllegalArgumentException(getString(R.string.title_pro_feature));
 
+        if (!PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("pro", false)) {
+            FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+            fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
+            fragmentTransaction.commit();
+            return;
+        }
+
+        try {
             if (openPgpConnection == null || !openPgpConnection.isBound())
                 throw new IllegalArgumentException(getString(R.string.title_no_openpgp));
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 366e039e..0a4fa58c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -53,6 +53,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class FragmentMessages extends FragmentEx {
+    private ViewGroup view;
     private RecyclerView rvMessage;
     private TextView tvNoEmail;
     private ProgressBar pbWait;
@@ -87,7 +88,7 @@ public class FragmentMessages extends FragmentEx {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_messages, container, false);
+        view = (ViewGroup) inflater.inflate(R.layout.fragment_messages, container, false);
 
         setHasOptionsMenu(true);
 
@@ -302,15 +303,21 @@ public class FragmentMessages extends FragmentEx {
             public boolean onQueryTextSubmit(String query) {
                 menuSearch.collapseActionView();
 
-                Intent intent = new Intent();
-                intent.putExtra("folder", folder);
-                intent.putExtra("search", query);
+                if (PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("pro", false)) {
+                    Intent intent = new Intent();
+                    intent.putExtra("folder", folder);
+                    intent.putExtra("search", query);
 
-                FragmentMessages fragment = new FragmentMessages();
-                fragment.setArguments(intent.getExtras());
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-                fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("search");
-                fragmentTransaction.commit();
+                    FragmentMessages fragment = new FragmentMessages();
+                    fragment.setArguments(intent.getExtras());
+                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                    fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("search");
+                    fragmentTransaction.commit();
+                } else {
+                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                    fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
+                    fragmentTransaction.commit();
+                }
 
                 return true;
             }