From ecb94beb3cf656b62f4eccaa1f87d1342db82af6 Mon Sep 17 00:00:00 2001
From: Ivan Kupalov <charlag@tuta.io>
Date: Sun, 14 Jun 2020 19:58:05 +0200
Subject: [PATCH] Fix settings default values for preferences (#1828)

At some point settings DSL was refactored to first add a preference and
then run the builder. We shouldn't add a preference to the hierarchy
without setting a key for the preference first because preference gets
it's default value in `onAttachedToHierarchy()` and if the key is not
set then no default value will be set either.

This commit changes the order to execute builder (and set the key)
first and and preference to the point later.
---
 .../com/keylesspalace/tusky/settings/SettingsDSL.kt  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/settings/SettingsDSL.kt b/app/src/main/java/com/keylesspalace/tusky/settings/SettingsDSL.kt
index effad5370..438580eed 100644
--- a/app/src/main/java/com/keylesspalace/tusky/settings/SettingsDSL.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/settings/SettingsDSL.kt
@@ -12,22 +12,22 @@ class PreferenceParent(
 
 inline fun PreferenceParent.preference(builder: Preference.() -> Unit): Preference {
     val pref = Preference(context)
-    addPref(pref)
     builder(pref)
+    addPref(pref)
     return pref
 }
 
 inline fun PreferenceParent.listPreference(builder: ListPreference.() -> Unit): ListPreference {
     val pref = ListPreference(context)
-    addPref(pref)
     builder(pref)
+    addPref(pref)
     return pref
 }
 
 inline fun PreferenceParent.emojiPreference(builder: EmojiPreference.() -> Unit): EmojiPreference {
     val pref = EmojiPreference(context)
-    addPref(pref)
     builder(pref)
+    addPref(pref)
     return pref
 }
 
@@ -35,8 +35,8 @@ inline fun PreferenceParent.switchPreference(
         builder: SwitchPreference.() -> Unit
 ): SwitchPreference {
     val pref = SwitchPreference(context)
-    addPref(pref)
     builder(pref)
+    addPref(pref)
     return pref
 }
 
@@ -44,8 +44,8 @@ inline fun PreferenceParent.editTextPreference(
         builder: EditTextPreference.() -> Unit
 ): EditTextPreference {
     val pref = EditTextPreference(context)
-    addPref(pref)
     builder(pref)
+    addPref(pref)
     return pref
 }
 
@@ -53,8 +53,8 @@ inline fun PreferenceParent.checkBoxPreference(
         builder: CheckBoxPreference.() -> Unit
 ): CheckBoxPreference {
     val pref = CheckBoxPreference(context)
-    addPref(pref)
     builder(pref)
+    addPref(pref)
     return pref
 }