From a74752fa41bd45268082db207da90feda08325e6 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 15 Apr 2016 11:17:46 +0200 Subject: [PATCH] fix potential crash in group information screen --- .../ui/fragments/social/GroupInformationFragment.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 349662874..b9f85fada 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 @@ -70,6 +70,7 @@ public class GroupInformationFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { if (view == null) view = inflater.inflate(R.layout.fragment_group_info, container, false); + questCollectViewAdapter = new QuestCollectRecyclerViewAdapter(); viewBinding = DataBindingUtil.bind(view); viewBinding.setHideParticipantCard(false); @@ -84,7 +85,6 @@ public class GroupInformationFragment extends Fragment { ButterKnife.bind(this, view); collectionStats.setLayoutManager(new LinearLayoutManager(getContext())); - questCollectViewAdapter = new QuestCollectRecyclerViewAdapter(); collectionStats.setAdapter(questCollectViewAdapter); bossHpBar = DataBindingUtil.bind(view.findViewById(R.id.bossHpBar)); bossRageBar = DataBindingUtil.bind(view.findViewById(R.id.bossRageBar)); @@ -125,10 +125,13 @@ public class GroupInformationFragment extends Fragment { if (group == null || quest == null) { return; } - questCollectViewAdapter.setQuestContent(quest); - if (group.quest.getProgress() != null) { - questCollectViewAdapter.setQuestProgress(group.quest.getProgress()); + if (questCollectViewAdapter != null) { + questCollectViewAdapter.setQuestContent(quest); + if (group.quest.getProgress() != null) { + questCollectViewAdapter.setQuestProgress(group.quest.getProgress()); + } } + bossHpBar.valueBarLayout.setVisibility((quest.boss != null && quest.boss.hp > 0) ? View.VISIBLE : View.GONE); bossRageBar.valueBarLayout.setVisibility((quest.boss != null && quest.boss.rage_value > 0) ? View.VISIBLE : View.GONE);