sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-22 13:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crashes

Browse source
This commit is contained in:
Phillip Thelen 2017-04-19 12:04:13 +02:00
parent 8937347afd
commit 5a09cd770a
2 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
View file

@ -89,4 +89,12 @@ public class Tag extends BaseModel {
}
return super.equals(o);
}
@Override
public void save() {
if (user_id == null) {
return;
}
super.save();
}
}

47
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
View file

@ -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();
}
}