From 0d4528de67d620a8fa81212c580513aab07fd2c8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 24 Oct 2019 17:43:23 +0200
Subject: [PATCH] Further tweaks for party page

---
 .../implementation/SocialRepositoryImpl.kt    |  8 +----
 .../ui/fragments/social/ChatFragment.kt       |  2 --
 .../social/party/PartyDetailFragment.kt       |  1 -
 .../fragments/social/party/PartyFragment.kt   | 30 ++++++++-----------
 4 files changed, 14 insertions(+), 27 deletions(-)

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 e3c3cad28..b7d32595e 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
@@ -125,13 +125,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
 
     override fun retrieveGroup(id: String): Flowable<Group> {
         return Flowable.zip(apiClient.getGroup(id).doOnNext { localRepository.save(it) }, retrieveGroupChat(id)
-                .map { message ->
-                    message.forEach {
-                        it.groupId = id
-                    }
-                    message
-                }
-                .doOnSuccess { localRepository.save(it) }.toFlowable(),
+                .toFlowable(),
                 BiFunction<Group, List<ChatMessage>, Group> { group, _ ->
                     group
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
index 44ae2c4b8..ea3a528c0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
@@ -93,8 +93,6 @@ class ChatFragment : BaseFragment() {
             }
         })
 
-        refresh()
-
         viewModel?.getChatMessages()?.subscribe(Consumer<RealmResults<ChatMessage>> { this.setChatMessages(it) }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
 
         communityGuidelinesReviewView.setOnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 28147bb26..cf2340dbb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -191,7 +191,6 @@ class PartyDetailFragment : BaseFragment() {
     }
 
     private fun updateMembersList(members: RealmResults<Member>?) {
-        membersWrapper?.removeAllViews()
         val leaderID = viewModel?.leaderID
         members?.forEachIndexed { index, member ->
             val memberView = (if (membersWrapper?.childCount ?: 0 > index) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
index 6af424a46..dd4d67454 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
@@ -58,26 +58,22 @@ class PartyFragment : BaseMainFragment() {
 
         viewModel.loadPartyID()
 
-        compositeSubscription.add(userRepository.getUser()
-                .map {
-                    it.hasParty()
-                }
+        compositeSubscription.add(viewModel.groupIDFlowable.map { it.value != null }
                 .distinctUntilChanged()
                 .subscribe(Consumer {
-                    val fragment = firstFragment
-                    if (fragment != null) {
-                        childFragmentManager.beginTransaction().remove(fragment).commit()
-                    }
-                    viewPager?.adapter?.notifyDataSetChanged()
+            val fragment = firstFragment
+            if (fragment != null) {
+                childFragmentManager.beginTransaction().remove(fragment).commit()
+            }
+            viewPager?.adapter?.notifyDataSetChanged()
 
-                    if (it) {
-                        viewModel.retrieveGroup {}
-                        tabLayout?.visibility = View.VISIBLE
-                    } else {
-                        tabLayout?.visibility = View.GONE
-                    }
-
-                }, RxErrorHandler.handleEmptyError()))
+            if (it) {
+                viewModel.retrieveGroup {}
+                tabLayout?.visibility = View.VISIBLE
+            } else {
+                tabLayout?.visibility = View.GONE
+            }
+        }, RxErrorHandler.handleEmptyError()))
 
         viewPager?.currentItem = 0