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

fix casting items

Browse source
This commit is contained in:
Phillip Thelen 2017-07-06 14:22:48 +02:00
parent 38352ad4c2
commit 0d14fd5e3e
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
View file

@ -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());
}
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java
View file

@ -58,6 +58,8 @@ public class MemberSerialization implements JsonDeserializer<Member> {
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")) {