From 378f71d5860afa9211cbcf7b9975157e439dad08 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 19 Sep 2026 09:12:56 +0200
Subject: [PATCH] Enable pro for demo accounts

---
 .../email/BoundaryCallbackMessages.java       |  2 +-
 .../java/eu/faircode/email/EntityAccount.java | 24 +++++++++++++++----
 .../eu/faircode/email/EntityIdentity.java     |  4 ++--
 .../eu/faircode/email/EntityOperation.java    |  2 +-
 .../eu/faircode/email/FragmentAccount.java    |  2 +-
 .../eu/faircode/email/FragmentIdentity.java   |  2 +-
 .../java/eu/faircode/email/FragmentOAuth.java |  2 +-
 .../java/eu/faircode/email/FragmentPop.java   |  2 +-
 .../eu/faircode/email/ServiceSynchronize.java |  2 +-
 9 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 7882b79ccc..4140014319 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -425,7 +425,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         }
 
         EntityAccount account = db.account().getAccount(browsable.account);
-        if (account == null || account.protocol != EntityAccount.TYPE_IMAP || account.isTestAccount())
+        if (account == null || account.protocol != EntityAccount.TYPE_IMAP || account.isTestAccount(context))
             return 0;
 
         if (criteria == null) {
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 4db10c4384..0f79bf017e 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -27,6 +27,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
@@ -565,12 +566,27 @@ public class EntityAccount extends EntityOrder implements Serializable {
         };
     }
 
-    boolean isTestAccount() {
-        return isTestUser(this.user);
+    boolean isTestAccount(Context context) {
+        return isTestUser(context, this.user);
     }
 
-    static boolean isTestUser(String user) {
-        return (user != null && user.endsWith("@demo.faircode.eu"));
+    private static final String DEMO_DOMAIN_SHA256 = "6aa5aef252c27578aa36a14b06d3ba612fe39d054705a7282c77ee78ce276fc4";
+
+    static boolean isTestUser(Context context, String user) {
+        String domain = UriHelper.getEmailDomain(user);
+        if (TextUtils.isEmpty(domain))
+            return false;
+        try {
+            boolean demo = DEMO_DOMAIN_SHA256.equals(Helper.sha256(domain));
+            if (demo && context != null) {
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                prefs.edit().putBoolean("pro", true).apply();
+            }
+            return demo;
+        } catch (Throwable ex) {
+            Log.e(ex);
+            return false;
+        }
     }
 
     static EntityAccount getTestAccount(String user) {
diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index b3158a8000..58fb12a30d 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -458,8 +458,8 @@ public class EntityIdentity {
         return (display == null ? name : display);
     }
 
-    boolean isTestIdentity() {
-        return EntityAccount.isTestUser(this.user);
+    boolean isTestIdentity(Context context) {
+        return EntityAccount.isTestUser(context, this.user);
     }
 
     static EntityIdentity getTestIdentity(Long account, String user) {
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 06c3a13e7c..e741d0ee02 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -117,7 +117,7 @@ public class EntityOperation {
         DB db = DB.getInstance(context);
 
         EntityAccount account = db.account().getAccount(message.account);
-        if (account != null && account.isTestAccount()) {
+        if (account != null && account.isTestAccount(context)) {
             if (DELETE.equals(name) || SEND.equals(name))
                 db.message().deleteMessage(message.id);
             return;
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 902f90dbca..ce95e38aba 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -792,7 +792,7 @@ public class FragmentAccount extends FragmentBase {
     }
 
     private void onCheck() {
-        if (EntityAccount.isTestUser(etUser.getText().toString())) {
+        if (EntityAccount.isTestUser(getContext(), etUser.getText().toString())) {
             EntityAccount.createTestAccount(this, etUser.getText().toString(), new Runnable() {
                 @Override
                 public void run() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index a28f2ee196..acb26ecd75 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -785,7 +785,7 @@ public class FragmentIdentity extends FragmentBase {
     private void onSave(boolean should) {
         EntityAccount account = (EntityAccount) spAccount.getSelectedItem();
 
-        if (account != null && EntityAccount.isTestUser(etUser.getText().toString())) {
+        if (account != null && EntityAccount.isTestUser(getContext(), etUser.getText().toString())) {
             EntityIdentity.createTestIdentity(this, account.id, etUser.getText().toString(), new Runnable() {
                 @Override
                 public void run() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 574f9c1125..178f51f99b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -379,7 +379,7 @@ public class FragmentOAuth extends FragmentBase {
                 String name = etName.getText().toString().trim();
                 String email = etEmail.getText().toString().trim();
 
-                if (EntityAccount.isTestUser(email)) {
+                if (EntityAccount.isTestUser(getContext(), email)) {
                     EntityAccount.createTestAccount(this, email, new Runnable() {
                         @Override
                         public void run() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index 0d5f7ac533..39b7a8e7a4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -473,7 +473,7 @@ public class FragmentPop extends FragmentBase {
     }
 
     private void onSave(boolean should) {
-        if (EntityAccount.isTestUser(etUser.getText().toString())) {
+        if (EntityAccount.isTestUser(getContext(), etUser.getText().toString())) {
             EntityAccount.createTestAccount(this, etUser.getText().toString(), new Runnable() {
                 @Override
                 public void run() {
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 5d2a484bc5..37a7ed6bba 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1631,7 +1631,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
         final PowerManager.WakeLock wlMessage = pm.newWakeLock(
                 PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":account." + account.id + ".message");
 
-        if (account != null && account.isTestAccount())
+        if (account != null && account.isTestAccount(this))
             return;
 
         long start = new Date().getTime();