sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-08-01 03:30:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix minor errors

Browse source
This commit is contained in:
Phillip Thelen 2017-10-10 20:03:41 +02:00
parent 12325641cc
commit ac2bfaf7b3
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica" package="com.habitrpg.android.habitica"
android:versionCode="1940" android:versionCode="1943"
android:versionName="1.2.1" android:versionName="1.2.2"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:installLocation="auto" > android:installLocation="auto" >

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

@ -109,7 +109,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
@Override @Override
public Observable<TaskScoringResult> taskChecked(User user, String taskId, boolean up, boolean force) { public Observable<TaskScoringResult> taskChecked(User user, String taskId, boolean up, boolean force) {
return localRepository.getTask(taskId) return localRepository.getTask(taskId).first()
.flatMap(task -> taskChecked(user, task, up, force)); .flatMap(task -> taskChecked(user, task, up, force));
} }

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

@ -1285,7 +1285,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
this.task.setType(taskType); this.task.setType(taskType);
} }
if (this.saveTask(this.task)) { if (this.saveTask(this.task) && task.isValid()) {
//send back to other elements. //send back to other elements.
if (TaskFormActivity.this.task.getId() == null) { if (TaskFormActivity.this.task.getId() == null) {
taskRepository.createTaskInBackground(task); taskRepository.createTaskInBackground(task);

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
View file

@ -145,7 +145,7 @@ public abstract class BaseMainFragment extends BaseFragment {
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
if (user != null) { if (user != null && user.isValid()) {
outState.putString("userId", user.getId()); outState.putString("userId", user.getId());
} }

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

@ -76,7 +76,7 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
int[] ids = {appWidgetId}; int[] ids = {appWidgetId};
if (taskId != null) { if (taskId != null) {
userRepository.getUser(userId).flatMap(user -> taskRepository.taskChecked(user, taskId, TaskDirection.up.toString().equals(direction), false)) userRepository.getUser(userId).first().flatMap(user -> taskRepository.taskChecked(user, taskId, TaskDirection.up.toString().equals(direction), false))
.subscribe(taskDirectionData -> { .subscribe(taskDirectionData -> {
showToastForTaskDirection(context, taskDirectionData, userId); showToastForTaskDirection(context, taskDirectionData, userId);
}, RxErrorHandler.handleEmptyError(), () -> this.onUpdate(context, mgr, ids)); }, RxErrorHandler.handleEmptyError(), () -> this.onUpdate(context, mgr, ids));

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

@ -56,7 +56,7 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
String taskId = intent.getStringExtra(TASK_ID_ITEM); String taskId = intent.getStringExtra(TASK_ID_ITEM);
if (taskId != null) { if (taskId != null) {
userRepository.getUser(userId).flatMap(user -> taskRepository.taskChecked(user, taskId, true, false)) userRepository.getUser(userId).first().flatMap(user -> taskRepository.taskChecked(user, taskId, true, false))
.subscribe(taskDirectionData -> { .subscribe(taskDirectionData -> {
taskRepository.markTaskCompleted(taskId, true); taskRepository.markTaskCompleted(taskId, true);
showToastForTaskDirection(context, taskDirectionData, userId); showToastForTaskDirection(context, taskDirectionData, userId);