also remove user styles when removing old chat messages

This commit is contained in:
Phillip Thelen 2019-04-22 12:14:09 +02:00
parent 96e55732b4
commit 1b3a67ff5f
3 changed files with 10 additions and 6 deletions

View file

@ -152,7 +152,7 @@ android {
buildConfigField "String", "STORE", "\"google\"" buildConfigField "String", "STORE", "\"google\""
multiDexEnabled true multiDexEnabled true
versionCode 2093 versionCode 2096
versionName "1.9" versionName "1.9"
} }

View file

@ -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.data.local.SocialLocalRepository
import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.members.Member
import com.habitrpg.android.habitica.models.social.ChatMessage import com.habitrpg.android.habitica.models.social.*
import com.habitrpg.android.habitica.models.social.ChatMessageLike import com.habitrpg.android.habitica.models.user.ContributorInfo
import com.habitrpg.android.habitica.models.social.Group
import com.habitrpg.android.habitica.models.social.GroupMembership
import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.models.user.User
import io.reactivex.Flowable import io.reactivex.Flowable
import io.realm.Realm import io.realm.Realm
@ -211,10 +209,15 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
messagesToRemove.add(existingMessage) 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 { realm.executeTransaction {
for (member in messagesToRemove) { for (member in messagesToRemove) {
member.deleteFromRealm() member.deleteFromRealm()
} }
userStylestoRemove.deleteAllFromRealm()
contributorToRemove.deleteAllFromRealm()
} }
} }
} }

View file

@ -1,5 +1,6 @@
- Redesigned Class selection - Redesigned Class selection
- Redesigned Task Form - Redesigned Task Form
- Redesigned Report message dialog
- Optimized user and content loading - Optimized user and content loading
- Improved FAQ and settings - Improved FAQ and settings
- Fixed Time Travelers shop display