From f2a87dbe842c7930beabda79bb1b149f2a6f6e4b Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 9 Feb 2018 19:24:24 +0100
Subject: [PATCH] change preference model

---
 .../android/habitica/models/user/Preferences.kt    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index 81f57cf96..b5d0aefc8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -15,15 +15,9 @@ open class Preferences : RealmObject(), AvatarPreferences {
     private var hair: Hair? = null
     var suppressModals: SuppressedModals? = null
     private var costume: Boolean = false
-    var toolbarCollapsed: Boolean = false
-    var advancedCollapsed: Boolean = false
-    var tagsCollapsed: Boolean = false
-    var newTaskEdit: Boolean = false
     var isDisableClasses: Boolean = false
-    var stickyHeader: Boolean = false
     @SerializedName("sleep")
     var isSleep: Boolean = false
-    var hideHeader: Boolean = false
     var dailyDueDefaultView: Boolean = false
     var automaticAllocation: Boolean = false
     var allocationMode: String? = null
@@ -113,11 +107,11 @@ open class Preferences : RealmObject(), AvatarPreferences {
 
     fun setUserId(userId: String) {
         this.userId = userId
-        if (hair != null && !hair!!.isManaged) {
-            hair!!.userId = userId
+        if (hair?.isManaged == false) {
+            hair?.userId = userId
         }
-        if (suppressModals != null && !suppressModals!!.isManaged) {
-            suppressModals!!.userId = userId
+        if (suppressModals?.isManaged == false) {
+            suppressModals?.userId = userId
         }
     }