From 7a4d0aaff43af9b6dde3c08873412da04b160cf3 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 18 Sep 2019 12:29:45 +0200
Subject: [PATCH] Fix json parsing issues

---
 .../main/java/com/habitrpg/android/habitica/api/ApiService.kt   | 2 +-
 .../main/java/com/habitrpg/android/habitica/data/ApiClient.kt   | 2 +-
 .../java/com/habitrpg/android/habitica/data/SocialRepository.kt | 2 +-
 .../android/habitica/data/implementation/ApiClientImpl.kt       | 2 +-
 .../habitica/data/implementation/SocialRepositoryImpl.kt        | 2 +-
 .../android/habitica/models/responses/TaskDirectionData.kt      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index a6be203aa..d5b8b45a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -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>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index ad2194a76..ad6d5104b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -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>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
index 96120d514..5b940f098 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
@@ -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>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index 8b33b240c..de0d4f27b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -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())
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index c1a7143d0..3ee0ea7d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -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) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
index 4cd586f44..31fde57f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
@@ -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
 }