From f7dc8f936bb2f50906d7f049d435465f9c472bdb Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 23 Jun 2017 11:47:55 +0200
Subject: [PATCH] fix minor issues

---
 Habitica/AndroidManifest.xml                               | 2 +-
 Habitica/res/values/strings.constants.xml                  | 2 +-
 .../habitica/data/implementation/TaskRepositoryImpl.java   | 2 +-
 .../com/habitrpg/android/habitica/models/user/User.java    | 2 +-
 .../habitica/ui/views/yesterdailies/YesterdailyDialog.java | 7 ++-----
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index e4d2cf004..69037ba96 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -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="1894"
+    android:versionCode="1896"
     android:versionName="1.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/res/values/strings.constants.xml b/Habitica/res/values/strings.constants.xml
index 47c2a5904..6d95f808f 100644
--- a/Habitica/res/values/strings.constants.xml
+++ b/Habitica/res/values/strings.constants.xml
@@ -6,7 +6,7 @@
     <string name="SP_APIToken" translatable="false">APIToken</string>
     <string name="SP_username" translatable="false">Username</string>
     <string name="SP_email" translatable="false">E-mail</string>
-    <string name="base_url" translatable="false">https://habitica.com</string>
+    <string name="base_url" translatable="false">https://habitrpg-beta.herokuapp.com</string>
 
     <!-- Local notification actions -->
     <string name="accept_party_invite" translatable="false">ACCEPT_PARTY_INVITE</string>
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 6b5b65f24..cb4d49112 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
@@ -55,7 +55,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
     @Override
     public Observable<TaskScoringResult> taskChecked(@Nullable User user, Task task, boolean up, boolean force) {
         long now = new Date().getTime();
-        if (lastTaskAction > now-500 || force) {
+        if (lastTaskAction > now-500 && !force) {
             return Observable.just(null);
         }
         lastTaskAction = now;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index 27e2b4d1a..4ef6f0f20 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -458,7 +458,7 @@ public class User extends RealmObject {
         return party != null && party.id != null && party.id.length() > 0;
     }
 
-    public boolean getNeedsCron() {
+    public Boolean getNeedsCron() {
         return needsCron;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.java
index baa1542a6..4b2ffa3a1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.java
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.views.yesterdailies;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -24,7 +23,6 @@ import java.util.List;
 import butterknife.BindColor;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.realm.RealmResults;
 
 public class YesterdailyDialog extends AlertDialog {
 
@@ -103,9 +101,8 @@ public class YesterdailyDialog extends AlertDialog {
     public static void showDialogIfNeeded(Activity activity, String userId, UserRepository userRepository, TaskRepository taskRepository) {
         if (userRepository != null && userId != null) {
             userRepository.getUser(userId).first()
-                    .filter(User::getNeedsCron)
-                    .flatMap(user -> taskRepository.getTasks(Task.TYPE_DAILY, userId))
-                    .first()
+                    .filter(user -> user != null && user.getNeedsCron() != null && user.getNeedsCron())
+                    .flatMap(user -> taskRepository.getTasks(Task.TYPE_DAILY, userId).first())
                     .map(tasks -> tasks.where().equalTo("isDue", true).equalTo("completed", false).equalTo("yesterDaily", true).findAll())
                     .flatMap(taskRepository::getTaskCopies)
                     .subscribe(tasks -> {