fix: use a sane default settings object in cases where we can't connect.

Author: didiergarcia

core/src/main/java/com/segment/analytics/kotlin/core/Configuration.kt

@@ -33,7 +33,7 @@ data class Configuration(
     var flushAt: Int = 20,
     var flushInterval: Int = 30,
     var flushPolicies: List<FlushPolicy> = emptyList<FlushPolicy>(),
-    var defaultSettings: Settings = Settings(),
+    var defaultSettings: Settings? = null,
     var autoAddSegmentDestination: Boolean = true,
     var apiHost: String = DEFAULT_API_HOST,
     var cdnHost: String = DEFAULT_CDN_HOST,

core/src/main/java/com/segment/analytics/kotlin/core/Settings.kt

@@ -93,15 +93,7 @@ suspend fun Analytics.checkSettings() {
 
         withContext(analyticsDispatcher) {
 
-            val systemState = store.currentState(System::class)
-            val defaultSettings = systemState?.settings
-
-
-            if (settingsObj == null) {
-                defaultSettings?.let {
-                    update(defaultSettings)
-                }
-            } else {
+            settingsObj?.let {
                 log("Dispatching update settings on ${Thread.currentThread().name}")
                 store.dispatch(System.UpdateSettingsAction(settingsObj), System::class)
                 update(settingsObj)
@@ -117,22 +109,27 @@ internal fun Analytics.fetchSettings(
     writeKey: String,
     cdnHost: String
 ): Settings? = try {
-        val connection = HTTPClient(writeKey, this.configuration.requestFactory).settings(cdnHost)
-        val settingsString =
-            connection.inputStream?.bufferedReader()?.use(BufferedReader::readText) ?: ""
-        log("Fetched Settings: $settingsString")
-        LenientJson.decodeFromString(settingsString)
-    } catch (ex: Exception) {
-        reportErrorWithMetrics(
-            this,
-            AnalyticsError.SettingsFail(AnalyticsError.NetworkUnknown(URL("https://$cdnHost/projects/$writeKey/settings"), ex)),
-            "Failed to fetch settings",
-            Telemetry.INVOKE_ERROR_METRIC,
-            ex.stackTraceToString()
-        ) {
-            it["error"] = ex.toString()
-            it["writekey"] = writeKey
-            it["message"] = "Error retrieving settings"
-        }
-        null
-    }
+    val connection = HTTPClient(writeKey, this.configuration.requestFactory).settings(cdnHost)
+    val settingsString =
+        connection.inputStream?.bufferedReader()?.use(BufferedReader::readText) ?: ""
+    log("Fetched Settings: $settingsString")
+    LenientJson.decodeFromString(settingsString)
+} catch (ex: Exception) {
+    reportErrorWithMetrics(
+        this,
+        AnalyticsError.SettingsFail(
+            AnalyticsError.NetworkUnknown(
+                URL("https://$cdnHost/projects/$writeKey/settings"),
+                ex
+            )
+        ),
+        "Failed to fetch settings",
+        Telemetry.INVOKE_ERROR_METRIC,
+        ex.stackTraceToString()
+    ) {
+        it["error"] = ex.toString()
+        it["writekey"] = writeKey
+        it["message"] = "Error retrieving settings"
+    }
+    null
+}

core/src/main/java/com/segment/analytics/kotlin/core/State.kt

@@ -25,37 +25,38 @@ data class System(
 
     companion object {
         fun defaultState(configuration: Configuration, storage: Storage): System {
-            val settings = try {
-                Json.decodeFromString(
-                    Settings.serializer(),
-                    storage.read(Storage.Constants.Settings) ?: ""
-                )
-            } catch (ignored: Exception) {
-
-                // This could be an empty Settings...
-                if (configuration.defaultSettings.integrations.contains("Segment.io")) {
-                    configuration.defaultSettings
-                } else {
-                    Settings(
-                        integrations = buildJsonObject {
+            val storedSettings = storage.read(Storage.Constants.Settings)
+            val defaultSettings = configuration.defaultSettings ?: Settings(
+                integrations = buildJsonObject {
+                    put(
+                        "Segment.io",
+                        buildJsonObject {
                             put(
-                                "Segment.io",
-                                buildJsonObject {
-                                    put(
-                                        "apiKey",
-                                        configuration.writeKey
-                                    )
-                                    put("apiHost", Constants.DEFAULT_API_HOST)
-                                })
-                        },
-                        plan = emptyJsonObject,
-                        edgeFunction = emptyJsonObject,
-                        middlewareSettings = emptyJsonObject
+                                "apiKey",
+                                configuration.writeKey
+                            )
+                            put("apiHost", Constants.DEFAULT_API_HOST)
+                        })
+                },
+                plan = emptyJsonObject,
+                edgeFunction = emptyJsonObject,
+                middlewareSettings = emptyJsonObject
+            )
+
+            // Use stored settings or fallback to default settings
+            val settings = if (storedSettings == null || storedSettings == "" || storedSettings == "{}") {
+                defaultSettings
+            } else {
+                try {
+                    Json.decodeFromString(
+                        Settings.serializer(),
+                        storedSettings
                     )
+                } catch (ignored: Exception) {
+                    defaultSettings
                 }
-
-
             }
+
             return System(
                 configuration = configuration,
                 settings = settings,