diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java index 2f3c4b489..2cab18312 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java @@ -9,6 +9,7 @@ import android.support.v7.widget.RecyclerView; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.data.SocialRepository; +import com.habitrpg.android.habitica.data.UserRepository; import com.habitrpg.android.habitica.helpers.RxErrorHandler; import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter; @@ -25,6 +26,8 @@ public class SkillMemberActivity extends BaseActivity { @Inject public SocialRepository socialRepository; + @Inject + public UserRepository userRepository; @Override protected int getLayoutResId() { @@ -38,9 +41,6 @@ public class SkillMemberActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - EventBus.getDefault().register(this); - loadMemberList(); } @@ -55,15 +55,9 @@ public class SkillMemberActivity extends BaseActivity { }, RxErrorHandler.handleEmptyError()); recyclerView.setAdapter(viewAdapter); - socialRepository.getGroup("party") - .subscribe(group -> { - if (group == null) { - return; - } - - socialRepository.getGroupMembers(group.id) - .subscribe(members -> viewAdapter.updateData(members), - throwable -> {}); - }, throwable -> {}); + userRepository.getUser() + .first() + .flatMap(user -> socialRepository.getGroupMembers(user.getParty().id)) + .subscribe(viewAdapter::updateData, RxErrorHandler.handleEmptyError()); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java index 42f92682a..50d3b08a0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java @@ -58,6 +58,8 @@ public class MemberSerialization implements JsonDeserializer { if (obj.has("items")) { JsonObject items = obj.getAsJsonObject("items"); + member.setCurrentMount(items.get("currentMount").getAsString()); + member.setCurrentPet(items.get("currentPet").getAsString()); if (items.has("gear")) { JsonObject gear = items.getAsJsonObject("gear"); if (gear.has("costume")) {