From 826873e4b89bcf262db600f32225a77baf0c9e80 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 21 Feb 2020 16:56:44 +0100
Subject: [PATCH] Fix issue with quest completion dialog

---
 Habitica/build.gradle                                         | 2 +-
 Habitica/res/values/strings.xml                               | 3 ++-
 .../habitica/data/implementation/UserRepositoryImpl.kt        | 4 ++++
 .../com/habitrpg/android/habitica/models/shops/ShopItem.kt    | 4 ++--
 .../habitrpg/android/habitica/ui/activities/MainActivity.kt   | 3 ++-
 build.gradle                                                  | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index cc1439f1a..45fd60a5a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,7 @@ android {
         multiDexEnabled true
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2375
+        versionCode 2380
         versionName "2.5"
     }
 
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 64e1fb01f..ef23c6bcb 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -339,7 +339,7 @@
     <string name="login_incentive_count">Unlock by checking into Habitica %d times.</string>
     <string name="create_account">Unlock by creating an account</string>
     <string name="party_invite_short">Invite Friends</string>
-    <string name="login_incentive_short">login into Habitica regularly</string>
+    <string name="login_incentive_short">log into Habitica regularly</string>
     <string name="login_incentive_short_count">%d Checkins</string>
     <string name="create_account_short">create an account</string>
     <string name="successful_purchase">Purchased %1$s</string>
@@ -953,4 +953,5 @@
     <string name="unlock_previous_short">Finish Quest %d</string>
     <string name="unlock_level_short">Level %d</string>
     <string name="not_participating">You are not participating</string>
+    <string name="quest_completed">Quest completed!</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index a453b1aae..75ffbd7d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -352,6 +352,10 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         if (newUser.profile != null) {
             copiedUser.profile = newUser.profile
         }
+        if (newUser.party != null) {
+            copiedUser.party = newUser.party
+        }
+        copiedUser.needsCron = newUser.needsCron
         copiedUser.versionNumber = newUser.versionNumber
 
         localRepository.saveUser(copiedUser)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index f49f83bc0..ffb204910 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -90,7 +90,7 @@ open class ShopItem : RealmObject() {
     fun shortLockedReason(context: Context): String? {
         return when {
             unlockCondition != null -> {
-                unlockCondition?.readableUnlockCondition(context)
+                unlockCondition?.shortReadableUnlockCondition(context)
             }
             previous != null -> {
                 try {
@@ -110,7 +110,7 @@ open class ShopItem : RealmObject() {
     fun lockedReason(context: Context): String? {
         return when {
             unlockCondition != null -> {
-                unlockCondition?.shortReadableUnlockCondition(context)
+                unlockCondition?.readableUnlockCondition(context)
             }
             previous != null -> {
                 try {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index f80f95148..396cf53d3 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -35,7 +35,6 @@ import com.habitrpg.android.habitica.data.*
 import com.habitrpg.android.habitica.databinding.ActivityMainBinding
 import com.habitrpg.android.habitica.events.*
 import com.habitrpg.android.habitica.events.commands.FeedCommand
-import com.habitrpg.android.habitica.extensions.DateUtils
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.*
@@ -356,6 +355,8 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             if (quest?.completed?.isNotBlank() == true) {
                 compositeSubscription.add(inventoryRepository.getQuestContent(user?.party?.quest?.completed ?: "").firstElement().subscribe {
                     QuestCompletedDialog.showWithQuest(this, it)
+
+                    userRepository.updateUser(user, "party.quest.completed", "").subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
                 })
             }
         }
diff --git a/build.gradle b/build.gradle
index 7e30c061f..3c189c5d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
+        classpath 'com.android.tools.build:gradle:3.6.0-rc03'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "io.realm:realm-gradle-plugin:6.0.2"