fallback to default settings, not null

niallzato · niallzato · commit 9a06034fe0b4 · 2024-06-04T14:41:42.000+01:00
diff --git a/core/src/main/java/com/segment/analytics/kotlin/core/Settings.kt b/core/src/main/java/com/segment/analytics/kotlin/core/Settings.kt
@@ -112,6 +112,7 @@ internal fun Analytics.fetchSettings(
     val connection = HTTPClient(writeKey, this.configuration.requestFactory).settings(cdnHost)
     val settingsString =
         connection.inputStream?.bufferedReader()?.use(BufferedReader::readText) ?: ""
+    //configuration.defaultSettings = LenientJson.decodeFromString(settingsString)
     log("Fetched Settings: $settingsString")
     LenientJson.decodeFromString(settingsString)
 } catch (ex: Exception) {
@@ -121,5 +122,5 @@ internal fun Analytics.fetchSettings(
         it["writekey"] = writeKey
         it["message"] = "Error retrieving settings"
     }
-    null
+    configuration.defaultSettings
 }

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ internal fun Analytics.fetchSettings(`
`112`	`112`	`val connection = HTTPClient(writeKey, this.configuration.requestFactory).settings(cdnHost)`
`113`	`113`	`val settingsString =`
`114`	`114`	`connection.inputStream?.bufferedReader()?.use(BufferedReader::readText) ?: ""`
	`115`	`+ //configuration.defaultSettings = LenientJson.decodeFromString(settingsString)`
`115`	`116`	`log("Fetched Settings: $settingsString")`
`116`	`117`	`LenientJson.decodeFromString(settingsString)`
`117`	`118`	`} catch (ex: Exception) {`
`@@ -121,5 +122,5 @@ internal fun Analytics.fetchSettings(`
`121`	`122`	`it["writekey"] = writeKey`
`122`	`123`	`it["message"] = "Error retrieving settings"`
`123`	`124`	`}`
`124`		`- null`
	`125`	`+ configuration.defaultSettings`
`125`	`126`	`}`