From 08ef349aaec8a157717d864eb89262b38bf808cf Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Apr 2022 12:29:19 +0200
Subject: [PATCH] Added dev.domain property

---
 app/build.gradle                                       | 6 +++++-
 app/src/main/java/eu/faircode/email/MessageHelper.java | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4351e8da10..bd1ef90782 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -161,8 +161,9 @@ android {
             buildConfigField "String", "LIBRAVATAR_DNS", "\"_avatars-sec._tcp,_avatars._tcp\""
             buildConfigField "String", "LIBRAVATAR_URI", "\"https://seccdn.libravatar.org/avatar/\""
             buildConfigField "String", "LIBRAVATAR_INFO", "\"https://libravatar.org/\""
-            buildConfigField "String", "GPA_URI", localProperties.getProperty("gpa.uri", "\"\"")
             buildConfigField "String", "PAYPAL_URI", localProperties.getProperty("paypal.uri", "\"\"")
+            buildConfigField "String", "GPA_URI", localProperties.getProperty("gpa.uri", "\"\"")
+            buildConfigField "String", "DEV_DOMAIN", localProperties.getProperty("dev.domain", "\"\"")
         }
         fdroid {
             dimension "all"
@@ -180,6 +181,7 @@ android {
             buildConfigField "String", "LIBRAVATAR_INFO", "\"https://libravatar.org/\""
             buildConfigField "String", "PAYPAL_URI", "\"\""
             buildConfigField "String", "GPA_URI", "\"\""
+            buildConfigField "String", "DEV_DOMAIN", "\"\""
         }
         play {
             dimension "all"
@@ -198,6 +200,7 @@ android {
             buildConfigField "String", "LIBRAVATAR_INFO", "\"\""
             buildConfigField "String", "PAYPAL_URI", "\"\""
             buildConfigField "String", "GPA_URI", "\"\""
+            buildConfigField "String", "DEV_DOMAIN", "\"\""
         }
         amazon {
             dimension "all"
@@ -216,6 +219,7 @@ android {
             buildConfigField "String", "LIBRAVATAR_INFO", "\"\""
             buildConfigField "String", "PAYPAL_URI", "\"\""
             buildConfigField "String", "GPA_URI", "\"\""
+            buildConfigField "String", "DEV_DOMAIN", "\"\""
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e7f427f41b..aec01ade05 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1524,18 +1524,18 @@ public class MessageHelper {
                 }
         }
 
-        if (thread == null && BuildConfig.DEBUG) {
+        if (thread == null && !TextUtils.isEmpty(BuildConfig.DEV_DOMAIN)) {
             String awsses = imessage.getHeader("X-SES-Outgoing", null);
             if (!TextUtils.isEmpty(awsses)) {
                 Address[] froms = getFrom();
                 if (froms != null && froms.length > 0) {
                     String from = ((InternetAddress) froms[0]).getAddress();
-                    if (!TextUtils.isEmpty(from) && from.endsWith("@faircode.eu")) {
+                    if (!TextUtils.isEmpty(from) && from.endsWith("@" + BuildConfig.DEV_DOMAIN)) {
                         Address[] rr = getReply();
                         Address[] tos = (rr != null && rr.length > 0 ? rr : getTo());
                         if (tos != null && tos.length > 0) {
                             String email = ((InternetAddress) tos[0]).getAddress();
-                            if (!TextUtils.isEmpty(email) && !email.endsWith("@faircode.eu"))
+                            if (!TextUtils.isEmpty(email) && !email.endsWith("@" + BuildConfig.DEV_DOMAIN))
                                 thread = "ses:" + email;
                         }
                     }