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

fix various crashes

Browse source
This commit is contained in:
Phillip Thelen 2016-04-15 11:46:29 +02:00
parent f8d128e73b
commit 3bcce0755d
7 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -544,19 +544,19 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
accountHeader.updateProfile(profile); accountHeader.updateProfile(profile);
IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS); IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
if (user.getPreferences().getDisableClasses()) { if (user.getPreferences().getDisableClasses() || !user.getFlags().getClassSelected()) {
if (item != null) { if (item != null) {
drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS); drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
} }
} else { } else {
IDrawerItem newItem = item; IDrawerItem newItem = item;
if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS && item.isEnabled()) { if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS) {
newItem = new PrimaryDrawerItem() newItem = new PrimaryDrawerItem()
.withName(this.getString(R.string.sidebar_skills)) .withName(this.getString(R.string.sidebar_skills))
.withEnabled(false) .withEnabled(false)
.withBadge(this.getString(R.string.unlock_lvl_11)) .withBadge(this.getString(R.string.unlock_lvl_11))
.withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS); .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
} else if (user.getStats().getLvl() >= MIN_LEVEL_FOR_SKILLS && !item.isEnabled()) { } else if (user.getStats().getLvl() >= MIN_LEVEL_FOR_SKILLS) {
newItem = new PrimaryDrawerItem() newItem = new PrimaryDrawerItem()
.withName(this.getString(R.string.sidebar_skills)) .withName(this.getString(R.string.sidebar_skills))
.withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS); .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
View file

@ -631,7 +631,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
for (TaskTag tt : task.getTags()) { for (TaskTag tt : task.getTags()) {
int position = tagIds.indexOf(tt.getTag().getId()); int position = tagIds.indexOf(tt.getTag().getId());
if (tagCheckBoxList.size() > position) { if (tagCheckBoxList.size() > position && position >= 0) {
tagCheckBoxList.get(position).setChecked(true); tagCheckBoxList.get(position).setChecked(true);
} }
} }

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

@ -76,8 +76,10 @@ public class QuestCollectRecyclerViewAdapter extends RecyclerView.Adapter<QuestC
Picasso.with(view.getContext()) Picasso.with(view.getContext())
.load("https://habitica-assets.s3.amazonaws.com/mobileApp/images/" + "quest_" + quest.getKey() + "_" + key + ".png") .load("https://habitica-assets.s3.amazonaws.com/mobileApp/images/" + "quest_" + quest.getKey() + "_" + key + ".png")
.into(image); .into(image);
name.setText(quest.getCollect().get(key).text); if (quest.getCollect().get(key) != null) {
count.setText(progress.collect.get(key) + " / " + quest.getCollect().get(key).count); name.setText(quest.getCollect().get(key).text);
count.setText(progress.collect.get(key) + " / " + quest.getCollect().get(key).count);
}
} }
} }
} }

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableFragment.java
View file

@ -76,6 +76,8 @@ public class StableFragment extends BaseMainFragment {
} }
}); });
tabLayout.setupWithViewPager(viewPager); if (tabLayout != null && viewPager != null) {
tabLayout.setupWithViewPager(viewPager);
}
} }
} }

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java
View file

@ -177,7 +177,7 @@ public class StableRecyclerFragment extends BaseFragment {
} }
switch (itemType) { switch (itemType) {
case "pets": case "pets":
if (user.getItems().getPets().containsKey(animal.getKey()) && user.getItems().getPets().get(animal.getKey()) != null) { if (user.getItems().getPets() != null && user.getItems().getPets().containsKey(animal.getKey()) && user.getItems().getPets().get(animal.getKey()) != null) {
if (lastAnimal.getNumberOwned() == 0) { if (lastAnimal.getNumberOwned() == 0) {
lastAnimal.setColor(animal.getColor()); lastAnimal.setColor(animal.getColor());
} }
@ -185,7 +185,7 @@ public class StableRecyclerFragment extends BaseFragment {
} }
break; break;
case "mounts": case "mounts":
if (user.getItems().getMounts().containsKey(animal.getKey()) && user.getItems().getMounts().get(animal.getKey()) != null) { if (user.getItems().getMounts() != null && user.getItems().getMounts().containsKey(animal.getKey()) && user.getItems().getMounts().get(animal.getKey()) != null) {
if (lastAnimal.getNumberOwned() == 0) { if (lastAnimal.getNumberOwned() == 0) {
lastAnimal.setColor(animal.getColor()); lastAnimal.setColor(animal.getColor());
} }

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
View file

@ -103,8 +103,9 @@ public class ItemsFragment extends BaseMainFragment {
return ""; return "";
} }
}); });
if (tabLayout != null && viewPager != null) {
tabLayout.setupWithViewPager(viewPager); tabLayout.setupWithViewPager(viewPager);
}
} }
@Subscribe @Subscribe

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

@ -125,6 +125,8 @@ public class TavernFragment extends BaseMainFragment implements Callback<Group>
} }
}); });
tabLayout.setupWithViewPager(viewPager); if (tabLayout != null) {
tabLayout.setupWithViewPager(viewPager);
}
} }
} }