mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-05-19 20:29:02 +00:00
minor fixes for 4.0.1
This commit is contained in:
parent
247366821a
commit
d569d56502
5 changed files with 11 additions and 5 deletions
|
|
@ -250,8 +250,8 @@
|
|||
<item>mental_health</item>
|
||||
<item>getting_organized</item>
|
||||
<item>self_improvement</item>
|
||||
<item>spirituality'</item>
|
||||
<item>time_management'</item>
|
||||
<item>spirituality</item>
|
||||
<item>time_management</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="challenge_category_labels">
|
||||
|
|
|
|||
|
|
@ -125,9 +125,14 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
|
|||
}
|
||||
|
||||
private fun removeOldTasks(userID: String, onlineTaskList: List<Task>) {
|
||||
val groupIDs = onlineTaskList.map { it.group?.groupID }.distinct().toTypedArray()
|
||||
if (realm.isClosed) return
|
||||
val localTasks = realm.where(Task::class.java)
|
||||
.beginGroup()
|
||||
.equalTo("userId", userID)
|
||||
.or()
|
||||
.`in`("group.groupID", groupIDs)
|
||||
.endGroup()
|
||||
.beginGroup()
|
||||
.beginGroup()
|
||||
.equalTo("typeValue", TaskType.TODO.value)
|
||||
|
|
|
|||
|
|
@ -367,7 +367,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
|
|||
} else if (shopItem.purchaseType == "debuffPotion") {
|
||||
observable = userRepository.useSkill(shopItem.key, null).cast(Any::class.java)
|
||||
} else if (shopItem.purchaseType == "customization" || shopItem.purchaseType == "background" || shopItem.purchaseType == "backgrounds" || shopItem.purchaseType == "customizationSet") {
|
||||
observable = userRepository.unlockPath(item.unlockPath ?: "", item.value).cast(Any::class.java)
|
||||
observable = userRepository.unlockPath(item.unlockPath ?: "${item.pinType}.${item.key}" ?: "", item.value).cast(Any::class.java)
|
||||
} else if (shopItem.purchaseType == "debuffPotion") {
|
||||
observable = userRepository.useSkill(shopItem.key, null).cast(Any::class.java)
|
||||
} else if (shopItem.purchaseType == "card") {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
What’s new in version 4.0:
|
||||
New in 4.0.1:
|
||||
-Habitica has a brand new WearOS app for smart watches!
|
||||
-Some pesky bug fixes
|
||||
-Newly designed Backgrounds section
|
||||
-Ability to filter, preview, and pin Backgrounds
|
||||
-New bottom sheet designs in Items, Pets & Mounts, and Filters
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
NAME=4.0.1
|
||||
CODE=4380
|
||||
CODE=4400
|
||||
Loading…
Reference in a new issue