[MOBILE-3857] migrate config (#175)

* [MOBILE-3857] migrate config * Fix iOS
urbanairship · Aug 21, 2023 · e30231d · e30231d
1 parent 36316cf
commit e30231d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 69 deletions.
diff --git a/android/src/main/kotlin/com/airship/flutter/ConfigManager.kt b/android/src/main/kotlin/com/airship/flutter/ConfigManager.kt
diff --git a/android/src/main/kotlin/com/airship/flutter/FlutterAutopilot.kt b/android/src/main/kotlin/com/airship/flutter/FlutterAutopilot.kt
@@ -1,17 +1,27 @@
 package com.airship.flutter
 
 import android.content.Context
+import android.content.Context.MODE_PRIVATE
 import android.util.Log
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
 import com.airship.flutter.AirshipBackgroundExecutor.Companion.handleBackgroundMessage
 import com.urbanairship.UAirship
 import com.urbanairship.analytics.Analytics
 import com.urbanairship.android.framework.proxy.BaseAutopilot
 import com.urbanairship.android.framework.proxy.EventType
+import com.urbanairship.android.framework.proxy.ProxyConfig
 import com.urbanairship.android.framework.proxy.ProxyStore
 import com.urbanairship.android.framework.proxy.events.EventEmitter
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 
 class FlutterAutopilot : BaseAutopilot() {
 
@@ -41,6 +51,27 @@ class FlutterAutopilot : BaseAutopilot() {
     }
 
     override fun onMigrateData(context: Context, proxyStore: ProxyStore) {
-        // TODO
+        runBlocking {
+            context.airshipFlutterPluginStore.data.map { preferences ->
+                val key = preferences[APP_KEY] ?: return@map null
+                val secret = preferences[APP_SECRET] ?: return@map null
+                ProxyConfig.Environment(key, secret, null)
+            }.first()?.let {
+                context.airshipFlutterPluginStore.edit { preferences ->
+                    preferences.clear()
+                }
+                proxyStore.airshipConfig = ProxyConfig(defaultEnvironment = it)
+            }
+        }
     }
+
+
+    companion object {
+        private val APP_KEY = stringPreferencesKey("app_key")
+        private val APP_SECRET = stringPreferencesKey("app_secret")
+    }
+
+    private val Context.airshipFlutterPluginStore: DataStore<Preferences> by preferencesDataStore(
+            name = "airshipFlutterPlugin"
+    )
 }
diff --git a/ios/Classes/AirshipAutopilot.swift b/ios/Classes/AirshipAutopilot.swift
@@ -22,14 +22,20 @@ extension AirshipAutopilot: AirshipProxyDelegate {
     public func migrateData(store: AirshipFrameworkProxy.ProxyStore) {
         guard
             let defaults = UserDefaults(suiteName: "com.urbanairship.flutter"),
-            defaults.string(forKey: "appKey") != nil,
-            defaults.string(forKey: "appSecret") != nil
+            let appKey = defaults.string(forKey: "appKey"),
+            let appSecret = defaults.string(forKey: "appSecret")
         else {
             return
         }
 
-        // TODO
-
+        store.config = ProxyConfig(
+            defaultEnvironment: ProxyConfig.Environment(
+                logLevel: nil,
+                appKey: appKey,
+                appSecret: appSecret
+            )
+        )
+
         defaults.removeObject(forKey: "appKey")
         defaults.removeObject(forKey: "appSecret")
     }

diff --git a/ios/airship_flutter.podspec b/ios/airship_flutter.podspec
@@ -19,9 +19,7 @@ Airship flutter plugin.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-
-  s.ios.deployment_target   = "15.0"
+  s.ios.deployment_target      = "14.0"
   s.dependency "AirshipFrameworkProxy", "4.0.4"
-
 end