From 3dc30e17274237358d2bb8ce13eae7082a6e083e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 25 Jun 2024 08:28:40 +0200
Subject: [PATCH] Account avatars is a pro feature

---
 PLAYSTORE.txt                                     |  2 +-
 README.md                                         |  2 +-
 .../java/eu/faircode/email/AdapterAccount.java    | 15 +++++++++------
 .../java/eu/faircode/email/FragmentAccount.java   |  8 +++++++-
 .../main/java/eu/faircode/email/FragmentPop.java  |  8 +++++++-
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/PLAYSTORE.txt b/PLAYSTORE.txt
index 366668273a..5ff4b79e2f 100644
--- a/PLAYSTORE.txt
+++ b/PLAYSTORE.txt
@@ -78,7 +78,7 @@ This app starts a foreground service with a low-priority status bar notification
 
 All pro features are convenience or advanced features.
 
-* Account/identity/folder colors
+* Account/identity/folder colors/avatars
 * Colored stars
 * Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
 * Configurable notification actions
diff --git a/README.md b/README.md
index 5e619f68a3..e443a78887 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ This app starts a foreground service with a low-priority status bar notification
 
 All pro features are convenience or advanced features.
 
-* Account/identity/folder colors
+* Account/identity/folder colors/avatars
 * Colored stars ([instructions](https://m66b.github.io/FairEmail/#faq107))
 * Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo) ([instructions](https://m66b.github.io/FairEmail/#faq145))
 * Configurable notification actions
diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index e9cd6ab097..2372b9e1d4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -89,6 +89,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
     private LifecycleOwner owner;
     private LayoutInflater inflater;
 
+    private boolean pro;
     private int dp24;
     private int colorStripeWidth;
     private int colorWarning;
@@ -217,7 +218,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                 vwColor.setBackgroundColor(account.color == null ? Color.TRANSPARENT : account.color);
                 vwColor.setVisibility(ActivityBilling.isPro(context) ? View.VISIBLE : View.INVISIBLE);
 
-                if (account.avatar == null)
+                if (account.avatar == null || !pro)
                     ivAvatar.setVisibility(hasAvatars ? View.INVISIBLE : View.GONE);
                 else {
                     Bundle args = new Bundle();
@@ -962,6 +963,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
         this.owner = parentFragment.getViewLifecycleOwner();
         this.inflater = LayoutInflater.from(context);
 
+        this.pro = ActivityBilling.isPro(context);
         this.dp24 = Helper.dp2pixels(context, 24);
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -1011,11 +1013,12 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
         DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, filtered), false);
 
         hasAvatars = false;
-        for (TupleAccountFolder account : accounts)
-            if (account.avatar != null) {
-                hasAvatars = true;
-                break;
-            }
+        if (pro)
+            for (TupleAccountFolder account : accounts)
+                if (account.avatar != null) {
+                    hasAvatars = true;
+                    break;
+                }
 
         items = filtered;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 444d0ea625..3228982792 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -2057,8 +2057,14 @@ public class FragmentAccount extends FragmentBase {
     }
 
     private void onImageSelected(Uri uri) {
+        final Context context = getContext();
+
+        if (!ActivityBilling.isPro(context)) {
+            startActivity(new Intent(context, ActivityBilling.class));
+            return;
+        }
+
         try {
-            final Context context = getContext();
             NoStreamException.check(uri, context);
 
             context.getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index b2ede3de21..67a9f2b567 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -1094,8 +1094,14 @@ public class FragmentPop extends FragmentBase {
     }
 
     private void onImageSelected(Uri uri) {
+        final Context context = getContext();
+
+        if (!ActivityBilling.isPro(context)) {
+            startActivity(new Intent(context, ActivityBilling.class));
+            return;
+        }
+
         try {
-            final Context context = getContext();
             NoStreamException.check(uri, context);
 
             context.getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);