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

Fixes 1369

Browse source
This commit is contained in:
Phillip Thelen 2020-11-09 15:07:26 +01:00
parent c2b3a3bd90
commit f46ce3d2f0
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
View file

@ -46,7 +46,7 @@ interface UserRepository : BaseRepository {
fun changeClass(selectedClass: String): Flowable<User>
fun unlockPath(user: User, customization: Customization): Flowable<UnlockResponse>
fun unlockPath(user: User?, customization: Customization): Flowable<UnlockResponse>
fun unlockPath(user: User, set: CustomizationSet): Flowable<UnlockResponse>
fun runCron(tasks: MutableList<Task>)

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

@ -135,9 +135,10 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
override fun changeClass(selectedClass: String): Flowable<User> = apiClient.changeClass(selectedClass).flatMap { retrieveUser(false) }
override fun unlockPath(user: User, customization: Customization): Flowable<UnlockResponse> {
override fun unlockPath(user: User?, customization: Customization): Flowable<UnlockResponse> {
return apiClient.unlockPath(customization.path)
.doOnNext { unlockResponse ->
if (user == null) return@doOnNext
val copiedUser = localRepository.getUnmanagedCopy(user)
copiedUser.preferences = unlockResponse.preferences
copiedUser.purchased = unlockResponse.purchased

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
View file

@ -211,7 +211,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
return
}
if (customization?.identifier == activeCustomization) {
if (customization?.type != "background" && customization?.identifier == activeCustomization) {
return
}

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
View file

@ -45,7 +45,12 @@ class AvatarCustomizationFragment : BaseMainFragment<FragmentRecyclerviewBinding
compositeSubscription.add(adapter.getSelectCustomizationEvents()
.flatMap { customization ->
userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
if (customization.type == "background") {
userRepository.unlockPath(user, customization)
.flatMap { userRepository.retrieveUser(false) }
} else {
userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
}
}
.subscribe({ }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(adapter.getUnlockCustomizationEvents()