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

fix crashes when loading rewards

Browse source
This commit is contained in:
Phillip Thelen 2017-05-22 14:35:35 +02:00
parent 6271f5303b
commit 0431e64c19
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Habitica/res/values/strings.xml
View file

@ -603,4 +603,5 @@
<string name="new_challenge_title">New challenge title</string>
<string name="ownership">Ownership</string>
<string name="inn">Inn</string>
<string name="system">System</string>
</resources>

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
View file

@ -212,9 +212,9 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
public Observable<BuyResponse> buyItem(User user, String key, double value) {
return apiClient.buyItem(key)
.doOnNext(buyResponse -> localRepository.executeTransaction(realm -> {
buyResponse.items.setUserId(user.getId());
User copiedUser = localRepository.getUnmanagedCopy(user);
if (buyResponse.items != null) {
buyResponse.items.setUserId(user.getId());
copiedUser.setItems(buyResponse.items);
}
if (buyResponse.hp != null) {

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
View file

@ -144,7 +144,11 @@ public class ChatRecyclerViewAdapter extends RealmRecyclerViewAdapter<ChatMessag
if (msg.sent != null && msg.sent.equals("true")) {
userLabel.setText(sendingUser.getProfile().getName());
} else {
userLabel.setText(msg.user);
if (msg.user != null && msg.user.length() > 0) {
userLabel.setText(msg.user);
} else {
userLabel.setText(R.string.system);
}
}
userLabel.setClickable(true);

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java
View file

@ -81,7 +81,7 @@ public class RewardsRecyclerViewAdapter extends RecyclerView.Adapter<RewardViewH
itemKeys.add(item.key);
}
itemKeys.add("potion");
if (user != null && user.getFlags().getArmoireEnabled()) {
if (user != null && user.getFlags() != null && user.getFlags().getArmoireEnabled()) {
itemKeys.add("armoire");
}
return itemKeys;

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
View file

@ -76,9 +76,7 @@ public class PartyFragment extends BaseMainFragment {
}
socialRepository.retrieveGroup("party")
.flatMap(group1 -> socialRepository.retrieveGroupMembers(group1.id, true))
.subscribe(members -> {
members.size();
}, RxErrorHandler.handleEmptyError());
.subscribe(members -> {}, RxErrorHandler.handleEmptyError());
}
setViewPagerAdapter();