From 05231ca96b3af6a34caf1dc4b01f9298dc0f0f05 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 15 Apr 2016 01:48:59 +0200 Subject: [PATCH] Fix two crashes --- .../android/habitica/callbacks/TaskScoringCallback.java | 8 +++++--- .../ui/fragments/social/GroupInformationFragment.java | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java index 8bb6972b9..996b84530 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java @@ -80,9 +80,11 @@ public class TaskScoringCallback implements Callback { .querySingle(new TransactionListener() { @Override public void onResultReceived(Object result) { - Item item = (Item)result; - item.setOwned(item.getOwned()+1); - item.save(); + if (result != null) { + Item item = (Item)result; + item.setOwned(item.getOwned()+1); + item.save(); + } } @Override diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java index 558170cfe..349662874 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java @@ -145,7 +145,10 @@ public class GroupInformationFragment extends Fragment { viewBinding.setHideParticipantCard(true); return; } - assert context != null; + if (group.quest.members == null) { + viewBinding.setHideParticipantCard(true); + return; + } LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); for (HabitRPGUser member : group.members) { final LinearLayout itemView = (LinearLayout) layoutInflater.inflate(R.layout.party_member_quest, questMemberView, false);