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

fix checklist issues

Browse source
This commit is contained in:
Phillip Thelen 2017-07-17 19:00:38 +02:00
parent cc79b47fb3
commit 0def043b7f
5 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="1917"
android:versionCode="1919"
android:versionName="1.1.4"
android:screenOrientation="portrait"
android:installLocation="auto" >

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
View file

@ -115,7 +115,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
public Observable<Task> 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())) {

12
Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
View file

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

3
Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
View file

@ -278,9 +278,6 @@ public class Task extends RealmObject implements Parcelable {
}
public void setReminders(RealmList<RemindersItem> reminders) {
for (RemindersItem reminder : reminders) {
reminder.setTask(this);
}
this.reminders = reminders;
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
View file

@ -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;