From 337d343d0f1f11025a02e79dc7bf3ad6628758a4 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 22 Mar 2016 18:33:24 +0100 Subject: [PATCH] fix different crashes --- .../android/habitica/ui/activities/TaskFormActivity.java | 6 ++++-- .../habitica/ui/fragments/AccountDetailsFragment.java | 2 +- .../android/habitica/ui/fragments/social/GuildFragment.java | 4 +--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java index 8e14510b4..0be6556b3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java @@ -613,7 +613,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem for(TaskTag tt : task.getTags()){ int tagNameLocation = tags.indexOf(tt.getTag().getId()); - if (tagsName.size() > tagNameLocation) { + if (tagsName.size() > tagNameLocation && tagNameLocation > 0) { for(CheckBox box : allTags){ if(tagsName.get(tagNameLocation) == box.getText()){ box.setChecked(true); @@ -714,7 +714,9 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem if(!userSelectedTags.isEmpty()){ for(CharSequence names : userSelectedTags){ int tagIdLocation = tagsName.indexOf(names); - userSelectedTagIds.add(tags.get(tagIdLocation)); //used for the SQL command + if (tagIdLocation > 0) { + userSelectedTagIds.add(tags.get(tagIdLocation)); //used for the SQL command + } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java index e9c9df108..7199ffede 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java @@ -18,7 +18,7 @@ public class AccountDetailsFragment extends BasePreferencesFragment { protected void setupPreferences() { for (Map.Entry preference : getPreferenceScreen().getSharedPreferences().getAll().entrySet()) { String key = preference.getKey(); - if (getAccountDetailsPreferences().contains(key)) { + if (getAccountDetailsPreferences().contains(key) && preference.getValue() != null) { findPreference(key).setSummary(preference.getValue().toString()); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java index 412c888a6..33172793c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java @@ -37,6 +37,7 @@ public class GuildFragment extends BaseMainFragment implements Callback { public void setGuild(Group guild) { this.guild = guild; + mAPIHelper.apiService.getGroup(this.guild.id, this); if (this.guildInformationFragment != null) { this.guildInformationFragment.setGroup(guild); } @@ -55,9 +56,6 @@ public class GuildFragment extends BaseMainFragment implements Callback { final ContentCache contentCache = new ContentCache(mAPIHelper.apiService); - // Get the full group data - mAPIHelper.apiService.getGroup(this.guild.id, this); - setViewPagerAdapter(); return v;