From 1b3a67ff5f5d67e2470bc46cc7057189b2c8425c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 22 Apr 2019 12:14:09 +0200
Subject: [PATCH] also remove user styles when removing old chat messages

---
 Habitica/build.gradle                                 |  2 +-
 .../implementation/RealmSocialLocalRepository.kt      | 11 +++++++----
 fastlane/changelog.txt                                |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 740609cc9..cc563279a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -152,7 +152,7 @@ android {
         buildConfigField "String", "STORE", "\"google\""
         multiDexEnabled true
 
-        versionCode 2093
+        versionCode 2096
         versionName "1.9"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
index 91d95f00a..d158ea35a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
@@ -2,10 +2,8 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.SocialLocalRepository
 import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.ChatMessageLike
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.social.GroupMembership
+import com.habitrpg.android.habitica.models.social.*
+import com.habitrpg.android.habitica.models.user.ContributorInfo
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.realm.Realm
@@ -211,10 +209,15 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
                     messagesToRemove.add(existingMessage)
                 }
             }
+            val idsToRemove = messagesToRemove.map { it.id }
+            val userStylestoRemove = realm.where(UserStyles::class.java).`in`("id", idsToRemove.toTypedArray()).findAll()
+            val contributorToRemove = realm.where(ContributorInfo::class.java).`in`("id", idsToRemove.toTypedArray()).findAll()
             realm.executeTransaction {
                 for (member in messagesToRemove) {
                     member.deleteFromRealm()
                 }
+                userStylestoRemove.deleteAllFromRealm()
+                contributorToRemove.deleteAllFromRealm()
             }
         }
     }
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index ca5a0e02d..52503f8b1 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,5 +1,6 @@
 - Redesigned Class selection
 - Redesigned Task Form
+- Redesigned Report message dialog
 - Optimized user and content loading
 - Improved FAQ and settings
-
+- Fixed Time Travelers shop display