sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix various issues

Browse source
This commit is contained in:
Phillip Thelen 2017-06-06 14:26:37 -07:00
parent 4b565d24e2
commit ed5a5a42c2
8 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -155,7 +155,7 @@ dependencies {
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"
defaultConfig {
applicationId "com.habitrpg.android.habitica"

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

@ -45,4 +45,6 @@ public interface TaskRepository extends BaseRepository {
void swapTaskPosition(int firstPosition, int secondPosition);
Observable<List<String>> updateTaskPosition(int currentPosition);
Observable<Task> getUnmanagedTask(String taskid);
}

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

@ -190,4 +190,10 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
return localRepository.getTaskAtPosition(currentPosition)
.flatMap(task -> apiClient.postTaskNewPosition(task.getId(), currentPosition));
}
@Override
public Observable<Task> getUnmanagedTask(String taskid) {
return getTask(taskid)
.map(localRepository::getUnmanagedCopy);
}
}

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

@ -77,7 +77,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
}
});
} else {
return Observable.empty();
return Observable.just(null);
}
}

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

@ -106,14 +106,10 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
for (Task localTask : localTasks) {
if (!onlineTaskList.contains(localTask)) {
if (localTask.checklist != null) {
for (ChecklistItem item : localTask.checklist) {
item.deleteFromRealm();
}
localTask.checklist.deleteAllFromRealm();
}
if (localTask.reminders != null) {
for (RemindersItem item : localTask.reminders) {
item.deleteFromRealm();
}
localTask.reminders.deleteAllFromRealm();
}
localTask.deleteFromRealm();
}
@ -153,6 +149,7 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
@Override
public Observable<Task> getTaskCopy(String taskId) {
return getTask(taskId)
.filter(task -> task.isManaged())
.map(realm::copyFromRealm);
}

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

@ -475,11 +475,12 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
this.task = task;
if (task != null) {
populate(task);
populateChecklistRecyclerView();
setTitle(task);
populateRemindersRecyclerView();
if (taskType.equals("todo") || taskType.equals("daily")) {
populateChecklistRecyclerView();
populateRemindersRecyclerView();
}
}
setTitle(task);

2
Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
View file

@ -53,7 +53,7 @@ public class HabitButtonWidgetService extends Service {
makeTaskMapping();
for (String taskid : this.taskMapping.keySet()) {
taskRepository.getTask(taskid).subscribe(this::updateData, RxErrorHandler.handleEmptyError());
taskRepository.getUnmanagedTask(taskid).first().subscribe(this::updateData, RxErrorHandler.handleEmptyError());
}
stopSelf();

2
seeds-sdk/build.gradle
View file

@ -13,7 +13,7 @@ buildscript {
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"
defaultConfig {
minSdkVersion 14