From f269f41a4e8de8bc983a8000b7e8acd19ae65508 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 29 Aug 2019 10:26:52 +0200
Subject: [PATCH] prevent android test user from flagging posts

---
 Habitica/build.gradle                             |  2 +-
 .../data/implementation/SocialRepositoryImpl.kt   | 15 +++++++++------
 habitica.properties.example                       |  1 +
 habitica.properties.travis                        |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 3dc6b7537..8b68dfbdb 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -152,7 +152,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         multiDexEnabled true
 
-        versionCode 2222
+        versionCode 2224
         versionName "2.1"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index ae39855aa..b7dbf3a74 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.data.implementation
 
+import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.local.SocialLocalRepository
@@ -68,12 +69,14 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
     }
 
     override fun flagMessage(chatMessage: ChatMessage, additionalInfo: String): Flowable<Void> {
-        return if (chatMessage.id == "") {
-            Flowable.empty()
-        } else {
-            val data = mutableMapOf<String, String>()
-            data["comment"] = additionalInfo
-            apiClient.flagMessage(chatMessage.groupId ?: "", chatMessage.id, data)
+        return when {
+            chatMessage.id == "" -> Flowable.empty()
+            userID == BuildConfig.ANDROID_TESTING_UUID -> Flowable.empty()
+            else -> {
+                val data = mutableMapOf<String, String>()
+                data["comment"] = additionalInfo
+                apiClient.flagMessage(chatMessage.groupId ?: "", chatMessage.id, data)
+            }
         }
     }
 
diff --git a/habitica.properties.example b/habitica.properties.example
index 3af43be42..482159495 100644
--- a/habitica.properties.example
+++ b/habitica.properties.example
@@ -14,3 +14,4 @@ PORT=80
 BASE_URL=https://habitica.com
 
 STAGING_KEY=
+ANDROID_TESTING_UUID=
diff --git a/habitica.properties.travis b/habitica.properties.travis
index 86925b693..8710df3c9 100644
--- a/habitica.properties.travis
+++ b/habitica.properties.travis
@@ -1,3 +1,4 @@
 PORT=3000
 BASE_URL=http://localhost:3000
 STAGING_KEY=
+ANDROID_TESTING_UUID=