From 5a09cd770a13514dc8f203f4b416639c95954743 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 19 Apr 2017 12:04:13 +0200 Subject: [PATCH] fix crashes --- .../habitrpg/android/habitica/models/Tag.java | 8 ++++ .../tasks/TaskRecyclerViewFragment.java | 47 ++++++++++--------- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java index 8b1233fae..f3c627180 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java @@ -89,4 +89,12 @@ public class Tag extends BaseModel { } return super.equals(o); } + + @Override + public void save() { + if (user_id == null) { + return; + } + super.save(); + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java index d9197bf41..cc5357638 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java @@ -86,6 +86,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli @BindView(R.id.empty_view_description) TextView emptyViewDescription; + @Nullable String classType; @Nullable private HabitRPGUser user; @@ -261,25 +262,27 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli } }); - switch (this.classType) { - case Task.TYPE_HABIT: { - this.emptyViewTitle.setText(R.string.empty_title_habits); - this.emptyViewDescription.setText(R.string.empty_description_habits); - break; - } - case Task.FREQUENCY_DAILY: { - this.emptyViewTitle.setText(R.string.empty_title_dailies); - this.emptyViewDescription.setText(R.string.empty_description_dailies); - break; - } - case Task.TYPE_TODO: { - this.emptyViewTitle.setText(R.string.empty_title_todos); - this.emptyViewDescription.setText(R.string.empty_description_todos); - break; - } - case Task.TYPE_REWARD: { - this.emptyViewTitle.setText(R.string.empty_title_rewards); - break; + if (this.classType != null) { + switch (this.classType) { + case Task.TYPE_HABIT: { + this.emptyViewTitle.setText(R.string.empty_title_habits); + this.emptyViewDescription.setText(R.string.empty_description_habits); + break; + } + case Task.FREQUENCY_DAILY: { + this.emptyViewTitle.setText(R.string.empty_title_dailies); + this.emptyViewDescription.setText(R.string.empty_description_dailies); + break; + } + case Task.TYPE_TODO: { + this.emptyViewTitle.setText(R.string.empty_title_todos); + this.emptyViewDescription.setText(R.string.empty_description_todos); + break; + } + case Task.TYPE_REWARD: { + this.emptyViewTitle.setText(R.string.empty_title_rewards); + break; + } } } } @@ -322,7 +325,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli } String getClassName() { - return this.classType; + return this.classType != null ? this.classType : ""; } @Subscribe @@ -362,7 +365,9 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli } public void setActiveFilter(String activeFilter) { - taskFilterHelper.setActiveFilter(classType, activeFilter); + if (classType != null) { + taskFilterHelper.setActiveFilter(classType, activeFilter); + } recyclerAdapter.filter(); } }