sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-21 05:09:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix duplicate items

Browse source
This commit is contained in:
Phillip Thelen 2023-09-11 15:09:43 +02:00
parent f6829e587b
commit 5ff6574b17
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
View file

@ -178,15 +178,15 @@ class TaskRepositoryImpl(
item.key = key
item.itemType = type
item.userID = user.id
when (type) {
"eggs" -> bgUser.items?.eggs?.add(item)
"food" -> bgUser.items?.food?.add(item)
"hatchingPotions" -> bgUser.items?.hatchingPotions?.add(item)
"quests" -> bgUser.items?.quests?.add(item)
}
}
item.numberOwned += 1
when (type) {
"eggs" -> bgUser.items?.eggs?.add(item)
"food" -> bgUser.items?.food?.add(item)
"hatchingPotions" -> bgUser.items?.hatchingPotions?.add(item)
"quests" -> bgUser.items?.quests?.add(item)
else -> ""
}
}
bgUser.stats?.hp = res.hp

3
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
View file

@ -99,7 +99,8 @@ class UserRepositoryImpl(
}
override suspend fun revive(): User? {
apiClient.revive()
val revivedUser = apiClient.revive()
return retrieveUser(false, true)
}

4
common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
View file

@ -75,8 +75,8 @@ object DataBindingUtils {
imageName.startsWith("handleless") -> "chair_$imageName"
else -> imageName
}
return name + if (imageFormat == null && FILEFORMAT_MAP.containsKey(name)) {
"." + FILEFORMAT_MAP[name]
return name + if (imageFormat == null && FILEFORMAT_MAP.containsKey(imageName)) {
"." + FILEFORMAT_MAP[imageName]
} else {
".${imageFormat ?: "png"}"
}