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

Fix json parsing issues

Browse source
This commit is contained in:
Phillip Thelen 2019-09-18 12:29:45 +02:00
parent e4b3119f7d
commit 7a4d0aaff4
6 changed files with 6 additions and 6 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

@ -215,7 +215,7 @@ interface ApiService {
fun seenMessages(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
@POST("groups/{gid}/invite")
fun inviteToGroup(@Path("gid") groupId: String, @Body inviteData: Map<String, Any>): Flowable<HabitResponse<List<String>>>
fun inviteToGroup(@Path("gid") groupId: String, @Body inviteData: Map<String, Any>): Flowable<HabitResponse<Void>>
@POST("groups/{gid}/reject-invite")
fun rejectGroupInvite(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>

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

@ -152,7 +152,7 @@ interface ApiClient {
fun seenMessages(groupId: String): Flowable<Void>
fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<List<String>>
fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<Void>
fun rejectGroupInvite(groupId: String): Flowable<Void>

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

@ -54,7 +54,7 @@ interface SocialRepository : BaseRepository {
fun getGroupMembers(id: String): Flowable<RealmResults<Member>>
fun retrieveGroupMembers(id: String, includeAllPublicFields: Boolean): Flowable<List<Member>>
fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<List<String>>
fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<Void>
fun getMember(userId: String?): Flowable<Member>
fun getMemberWithUsername(username: String?): Flowable<Member>

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

@ -530,7 +530,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
return apiService.seenMessages(groupId).compose(configureApiCallObserver())
}
override fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<List<String>> {
override fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<Void> {
return apiService.inviteToGroup(groupId, inviteData).compose(configureApiCallObserver())
}

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

@ -242,7 +242,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
.doOnNext { members -> localRepository.saveGroupMembers(id, members) }
}
override fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<List<String>> = apiClient.inviteToGroup(id, inviteData)
override fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<Void> = apiClient.inviteToGroup(id, inviteData)
override fun getMember(userId: String?): Flowable<Member> {
return if (userId == null) {

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
View file

@ -13,5 +13,5 @@ class TaskDirectionData {
var hp: Double = 0.0
var gp: Double = 0.0
var mp: Double = 0.0
var lvl: Int = 0
var lvl: Long = 0
}