From 8949f6a625a2a33da084d1ca3bda2e6b691da810 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 25 May 2017 13:10:49 +0200
Subject: [PATCH] improve party loading

---
 .../ui/fragments/social/party/PartyFragment.java  | 15 ++++++++++++---
 .../social/party/PartyMemberListFragment.java     |  1 -
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
index 1ec029d88..ea4088adf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
@@ -285,13 +285,22 @@ public class PartyFragment extends BaseMainFragment {
                         break;
                     }
                     case 1: {
-                        chatListFragment = new ChatListFragment();
-                        chatListFragment.configure("party", user, false);
+                        if (chatListFragment == null) {
+                            chatListFragment = new ChatListFragment();
+                            if (user.hasParty()) {
+                                chatListFragment.configure(user.getParty().id, user, false);
+                            }
+                        }
                         fragment = chatListFragment;
                         break;
                     }
                     case 2: {
-                        partyMemberListFragment = new PartyMemberListFragment();
+                        if (partyMemberListFragment == null) {
+                            partyMemberListFragment = new PartyMemberListFragment();
+                            if (user.hasParty()) {
+                                partyMemberListFragment.setPartyId(user.getParty().id);
+                            }
+                        }
                         fragment = partyMemberListFragment;
                         break;
                     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
index 78d9887d3..b0a6fb2c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
@@ -61,7 +61,6 @@ public class PartyMemberListFragment extends BaseFragment {
 
     public void setPartyId(String id) {
         this.partyId = id;
-        getUsers();
     }
 
     private void getUsers() {