From 7ed8a93daed6000063ffc240e58222cc60b994be Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 16 Sep 2019 17:58:19 +0200 Subject: [PATCH] Fix editing guilds --- .../android/habitica/ui/activities/GroupFormActivity.kt | 2 +- .../android/habitica/ui/fragments/social/GuildFragment.kt | 2 +- .../habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt index e73b3e440..843b959ee 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt @@ -110,7 +110,7 @@ class GroupFormActivity : BaseActivity() { bundle.putString("name", name) bundle.putString("groupType", groupType) bundle.putString("description", MarkdownParser.parseCompiled(this.groupDescriptionEditText.text)) - bundle.putBoolean("leaderCreateChallenge", leaderCreateChallengeSwitch.isActivated) + bundle.putBoolean("leaderOnlyChallenges", leaderCreateChallengeSwitch.isChecked) bundle.putString("leader", this.groupLeader) resultIntent.putExtras(bundle) setResult(Activity.RESULT_OK, resultIntent) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt index 668fe4c92..08c514d70 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt @@ -190,7 +190,7 @@ class GuildFragment : BaseMainFragment() { bundle.putString("description", guild?.description) bundle.putString("privacy", guild?.privacy) bundle.putString("leader", guild?.leaderID) - bundle.putBoolean("leaderCreateChallenge", guild?.leaderOnlyChallenges ?: true) + bundle.putBoolean("leaderOnlyChallenges", guild?.leaderOnlyChallenges ?: true) val intent = Intent(activity, GroupFormActivity::class.java) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt index 70d522aaa..de945038e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt @@ -220,7 +220,7 @@ open class GroupViewModel : BaseViewModel() { bundle?.getString("name"), bundle?.getString("description"), bundle?.getString("leader"), - bundle?.getBoolean("leaderCreateChallenge")) + bundle?.getBoolean("leaderOnlyChallenges")) .subscribe(Consumer {}, RxErrorHandler.handleEmptyError())) } } \ No newline at end of file