diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index 18a03bd52..53962d886 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -1261,4 +1261,5 @@ December Adjust when your day switches over past the default time of midnight. Buy Set + Your Tutorials were reset diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt index 2215cc4bf..2b50b94da 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt @@ -33,7 +33,7 @@ interface UserRepository : BaseRepository { fun revive(): Flowable - fun resetTutorial() + fun resetTutorial(): Maybe fun sleep(user: User): Flowable 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 6a80416eb..2c99f5221 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 @@ -108,8 +108,8 @@ class UserRepositoryImpl( } .flatMap { retrieveUser(false, true) } - override fun resetTutorial() { - localRepository.getTutorialSteps() + override fun resetTutorial(): Maybe { + return localRepository.getTutorialSteps() .firstElement() .map> { tutorialSteps -> val updateData = HashMap() @@ -119,7 +119,6 @@ class UserRepositoryImpl( updateData } .flatMap { updateData -> updateUser(updateData).firstElement() } - .subscribe({ }, RxErrorHandler.handleEmptyError()) } override fun sleep(user: User): Flowable { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt index e5be8d6be..72b2fb485 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt @@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.data.FAQRepository import com.habitrpg.android.habitica.databinding.FragmentSupportMainBinding import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController +import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import javax.inject.Inject @@ -57,7 +58,9 @@ class SupportMainFragment : BaseMainFragment() { } binding?.resetTutorialButton?.setOnClickListener { - userRepository.resetTutorial() + userRepository.resetTutorial().subscribe( { + activity?.showSnackbar(null, getString(R.string.tutorial_reset_confirmation)) + }, RxErrorHandler.handleEmptyError()) } }