sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-17 19:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crashes

Browse source
This commit is contained in:
Phillip Thelen 2017-05-18 18:09:41 +02:00
parent d0645de11f
commit d4dfbbfbc5
4 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
View file

@ -41,11 +41,14 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
realm.executeTransactionAsync(realm1 -> {
List<Task> sortedTasks = new ArrayList<>();
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getHabits()));
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getDailys()));
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getTodos()));
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getRewards()));
if (tasksOrder != null) {
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getHabits()));
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getDailys()));
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getTodos()));
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getRewards()));
} else {
sortedTasks.addAll(tasks.tasks.values());
}
if (userId != null) {
removeOldTasks(realm1, userId, sortedTasks);
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
View file

@ -71,7 +71,9 @@ public class QrCodeManager {
avatarView.configureView(false, false, false);
this.qrCodeWrapper = (FrameLayout) qrLayout.findViewById(R.id.qrCodeWrapper);
userRepository.getUser(userId).subscribe(avatarView::setUser, RxErrorHandler.handleEmptyError());
if (userRepository != null) {
userRepository.getUser(userId).subscribe(avatarView::setUser, RxErrorHandler.handleEmptyError());
}
this.displayQrCode();
this.setDownloadQr();

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

@ -317,7 +317,9 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
recyclerView.setAdapter((RecyclerView.Adapter) recyclerAdapter);
recyclerAdapter.filter();
if (recyclerAdapter != null) {
recyclerAdapter.filter();
}
if (Task.TYPE_REWARD.equals(classType)) {
compositeSubscription.add(taskRepository.getTasks(this.classType, userID)

8
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
View file

@ -220,9 +220,11 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
private void createTagEditViews() {
LayoutInflater inflater = LayoutInflater.from(getContext());
for (int index = 0; index < tags.size(); index++) {
Tag tag = tags.get(index);
createTagEditView(inflater, index, tag);
if (tags != null) {
for (int index = 0; index < tags.size(); index++) {
Tag tag = tags.get(index);
createTagEditView(inflater, index, tag);
}
}
createAddTagButton();
}