Fix parsing/serializing of UserInfo options. (#6089)

* Fix parsing/serializing of UserInfo options.

* Clean up.

Author: dbrant

app/src/main/java/org/wikipedia/dataclient/mwapi/UserInfo.kt

@@ -52,7 +52,12 @@ class UserInfo : BlockInfo() {
 
     @Serializable
     class Options {
-        @SerialName("watchdefault") val watchDefault: Int = 0
-        @SerialName("centralnotice-display-campaign-type-fundraising") val fundraisingOptIn: JsonElement? = null
+        @SerialName("watchdefault") private val watchDefault: JsonElement? = null
+        @SerialName("centralnotice-display-campaign-type-fundraising") private val fundraisingOptIn: JsonElement? = null
+
+        val watchEditedPagesByDefault get() = isExplicitOne(watchDefault)
+        val optedInToFundraising get() = isExplicitOne(fundraisingOptIn)
+
+        private fun isExplicitOne(element: JsonElement?) = element?.toString().orEmpty().replace("\"", "") == "1"
     }
 }

app/src/main/java/org/wikipedia/edit/summaries/EditSummaryFragment.kt

@@ -160,8 +160,7 @@ class EditSummaryFragment : Fragment() {
             }) {
                 val query = ServiceFactory.get(title.wikiSite)
                     .getWatchedStatusWithUserOptions(title.prefixedText).query!!
-                binding.watchPageCheckBox.isChecked = query.firstPage()!!.watched ||
-                        query.userInfo?.options?.watchDefault == 1
+                binding.watchPageCheckBox.isChecked = query.firstPage()!!.watched || query.userInfo?.options?.watchEditedPagesByDefault == true
             }
         } else {
             binding.watchPageCheckBox.isEnabled = false

app/src/main/java/org/wikipedia/settings/RemoteConfigRefreshTask.kt

@@ -20,10 +20,7 @@ class RemoteConfigRefreshTask() : RecurringTask() {
 
         if (AccountUtil.isLoggedIn) {
             val userInfo = ServiceFactory.get(WikipediaApp.instance.wikiSite).getUserInfo()
-            // This clumsy comparison is necessary because the field is an integer value when enabled, but an empty string when disabled.
-            // Since we want the default to lean towards opt-in, we check very specifically for an empty string, to make sure the user has opted out.
-            val fundraisingOptOut = userInfo.query?.userInfo?.options?.fundraisingOptIn?.toString()?.replace("\"", "")?.isEmpty()
-            Prefs.donationBannerOptIn = fundraisingOptOut != true
+            Prefs.donationBannerOptIn = userInfo.query?.userInfo?.options?.optedInToFundraising == true
         }
     }
 }