sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 11:46:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix changing cds

Browse source
This commit is contained in:
Phillip Thelen 2024-04-22 12:17:19 +02:00
parent eb999fb32b
commit deeed81e79
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
View file

@ -320,7 +320,7 @@ interface ApiService {
suspend fun validateNoRenewSubscription(@Body request: PurchaseValidationRequest): HabitResponse<Void>
@POST("user/custom-day-start")
suspend fun changeCustomDayStart(@Body updateObject: Map<String, Any>): HabitResponse<User>
suspend fun changeCustomDayStart(@Body updateObject: Map<String, Any>): HabitResponse<Void>
// Members URL
@GET("members/{mid}")

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

@ -189,7 +189,7 @@ interface ApiClient {
suspend fun validatePurchase(request: PurchaseValidationRequest): PurchaseValidationResult?
suspend fun changeCustomDayStart(updateObject: Map<String, Any>): User?
suspend fun changeCustomDayStart(updateObject: Map<String, Any>): Void?
// Members URL
suspend fun getMember(memberId: String): Member?

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

@ -735,7 +735,7 @@ class ApiClientImpl(
}
}
override suspend fun changeCustomDayStart(updateObject: Map<String, Any>): User? {
override suspend fun changeCustomDayStart(updateObject: Map<String, Any>): Void? {
return process { apiService.changeCustomDayStart(updateObject) }
}

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

@ -230,8 +230,14 @@ class UserRepositoryImpl(
override suspend fun changeCustomDayStart(dayStartTime: Int): User? {
val updateObject = HashMap<String, Any>()
updateObject["dayStart"] = dayStartTime
val newUser = apiClient.changeCustomDayStart(updateObject)
return mergeWithExistingUser(newUser)
apiClient.changeCustomDayStart(updateObject)
val liveUser = getLiveUser()
if (liveUser != null) {
localRepository.executeTransaction {
liveUser.preferences?.dayStart = dayStartTime
}
}
return liveUser
}
override suspend fun updateLanguage(languageCode: String): User? {