diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 599c8250c..bd1bd31d4 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java index 4678db86d..b1d3638db 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java @@ -115,7 +115,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl public Observable scoreChecklistItem(String taskId, String itemId) { return apiClient.scoreChecklistItem(taskId, itemId) - .flatMap(task -> localRepository.getTask(taskId)) + .flatMap(task -> localRepository.getTask(taskId).first()) .doOnNext(task -> localRepository.executeTransaction(realm -> { for (ChecklistItem item : task.getChecklist()) { if (itemId.equals(item.getId())) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java index 549383263..fd262bde7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java @@ -5,11 +5,7 @@ import java.util.Date; import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; -/** - * Created by keithholliday on 5/31/16. - */ public class RemindersItem extends RealmObject { - Task task; @PrimaryKey private String id; private Date startDate; @@ -51,14 +47,6 @@ public class RemindersItem extends RealmObject { this.time = time; } - public Task getTask() { - return task; - } - - public void setTask(Task task) { - this.task = task; - } - public String getType() { return this.type; } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java index c5f44e642..4efd53739 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java @@ -278,9 +278,6 @@ public class Task extends RealmObject implements Parcelable { } public void setReminders(RealmList reminders) { - for (RemindersItem reminder : reminders) { - reminder.setTask(this); - } this.reminders = reminders; } 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 dbd5cf3f3..16b683d07 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 @@ -1091,6 +1091,10 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem return false; } + if (!task.isValid()) { + return true; + } + taskRepository.executeTransaction(realm -> { task.text = text;