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

fix yesterdaily issue

Browse source
This commit is contained in:
Phillip Thelen 2017-07-07 11:52:46 +02:00
parent fa18ebceab
commit c24af7f8a0
6 changed files with 10 additions and 5 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="1908"
android:versionCode="1909"
android:versionName="1.1.1"
android:screenOrientation="portrait"
android:installLocation="auto" >

1
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
View file

@ -162,6 +162,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
this.context = context;
this.crashlyticsProxy = crashlyticsProxy;
this.popupNotificationsManager = popupNotificationsManager;
this.popupNotificationsManager.setApiClient(this);
HabiticaBaseApplication.getComponent().inject(this);
crashlyticsProxy.setUserIdentifier(this.hostConfig.getUser());

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

@ -236,7 +236,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
@Override
public Observable<TaskList> updateDailiesIsDue(Date date) {
DateFormat formatter = new SimpleDateFormat("YYYY-MM-dd", Locale.US);
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", Locale.US);
return apiClient.getTasks("dailys", formatter.format(date))
.doOnNext(localRepository::updateIsdue);
}

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

@ -80,7 +80,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
lastSync = new Date();
return apiClient.retrieveUser(withTasks)
.doOnNext(localRepository::saveUser)
.doOnNext(user -> taskRepository.saveTasks(user.getId(), user.getTasksOrder(), user.tasks))
.doOnNext(user -> {
if (withTasks) {
taskRepository.saveTasks(user.getId(), user.getTasksOrder(), user.tasks);
}
})
.flatMap(user -> {
Calendar calendar = new GregorianCalendar();
TimeZone timeZone = calendar.getTimeZone();

2
Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
View file

@ -77,7 +77,7 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
builder.append(" Gold");
}
if (mp > 0) {
builder.append(" + ").append(String.valueOf(round(mp, 2))).append(" Magic");
builder.append(" + ").append(String.valueOf(round(mp, 2))).append(" Mana");
}
return new Pair<>(builder, displayType);

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

@ -69,7 +69,7 @@ public class SkillTasksActivity extends BaseActivity {
fragment.taskType = Task.TYPE_DAILY;
break;
default:
fragment.taskType = Task.TYPE_REWARD;
fragment.taskType = Task.TYPE_TODO;
}
compositeSubscription.add(fragment.getTaskSelectionEvents().subscribe(task -> taskSelected(task), RxErrorHandler.handleEmptyError()));