Release 14.5.1 (#99)

* Release 14.5.1

* Support logPrivacyLevel in Android config

---------

Co-authored-by: crow <david.crow@airship.com>

Author: crow

AirshipFrameworkProxy.podspec

@@ -1,6 +1,6 @@
 
 Pod::Spec.new do |s|
-   s.version                 = "14.5.0"
+   s.version                 = "14.5.1"
    s.name                    = "AirshipFrameworkProxy"
    s.summary                 = "Airship iOS mobile framework proxy"
    s.documentation_url       = "https://docs.airship.com/platform/mobile"
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
    s.requires_arc            = true
    s.swift_version           = "6.0"
    s.source_files            = "ios/AirshipFrameworkProxy/**/*.{h,m,swift}"
-   s.dependency                'Airship', "19.6.0"
+   s.dependency                'Airship', "19.6.1"
    s.source_files            = 'ios/AirshipFrameworkProxyLoader/**/*.{swift,h,m,c,cc,mm,cpp}', 'ios/AirshipFrameworkProxy/**/*.{swift,h,m,c,cc,mm,cpp}'
 end
 

Package.swift

@@ -15,7 +15,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/urbanairship/ios-library.git", from: "19.6.0")
+        .package(url: "https://github.com/urbanairship/ios-library.git", from: "19.6.1")
     ],
     targets: [
         .target(

android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/BaseAutopilot.kt

@@ -190,12 +190,20 @@ public fun AirshipConfigOptions.Builder.applyProxyConfig(context: Context, proxy
         this.setDevelopmentAppKey(it.appKey)
             .setDevelopmentAppSecret(it.appSecret)
             .setDevelopmentLogLevel(it.logLevel ?: Log.DEBUG)
+
+        proxyConfig.androidConfig?.logPrivacyLevel?.let { privacyLevel ->
+            this.setDevelopmentLogPrivacyLevel(privacyLevel)
+        }
     }
 
     proxyConfig.productionEnvironment?.let {
         this.setProductionAppKey(it.appKey)
             .setProductionAppSecret(it.appSecret)
             .setProductionLogLevel(it.logLevel ?: Log.DEBUG)
+
+        proxyConfig.androidConfig?.logPrivacyLevel?.let { privacyLevel ->
+            this.setProductionLogPrivacyLevel(privacyLevel)
+        }
     }
 
     proxyConfig.defaultEnvironment?.let {

android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/ProxyConfig.kt

@@ -1,5 +1,6 @@
 package com.urbanairship.android.framework.proxy
 
+import com.urbanairship.AirshipConfigOptions
 import com.urbanairship.AirshipConfigOptions.Site
 import com.urbanairship.PrivacyManager.Feature
 import com.urbanairship.json.JsonMap
@@ -77,18 +78,25 @@ public data class ProxyConfig(
     }
 
     public data class Android(
-        val appStoreUri: String?, val fcmFirebaseAppName: String?, val notificationConfig: NotificationConfig?
+        val appStoreUri: String?,
+        val fcmFirebaseAppName: String?,
+        val notificationConfig: NotificationConfig?,
+        val logPrivacyLevel: AirshipConfigOptions.PrivacyLevel?
     ) : JsonSerializable {
 
         override fun toJsonValue(): JsonValue = JsonMap.newBuilder()
             .putOpt("appStoreUri", appStoreUri)
             .putOpt("fcmFirebaseAppName", fcmFirebaseAppName)
             .putOpt("notificationConfig", notificationConfig)
+            .putOpt("logPrivacyLevel", logPrivacyLevel?.let { Utils.logPrivacyLevelString(it) })
             .build()
             .toJsonValue()
 
-        internal constructor(config: JsonMap) : this(appStoreUri = config.get("appStoreUri")?.string,
+        internal constructor(config: JsonMap) : this(
+            appStoreUri = config.get("appStoreUri")?.string,
             fcmFirebaseAppName = config.get("fcmFirebaseAppName")?.string,
-            notificationConfig = config.get("notificationConfig")?.map?.let { NotificationConfig(it) })
+            notificationConfig = config.get("notificationConfig")?.map?.let { NotificationConfig(it) },
+            logPrivacyLevel = config.get("logPrivacyLevel")?.string?.let { Utils.parseLogPrivacyLevel(it) }
+        )
     }
 }

android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/Utils.kt

@@ -47,6 +47,23 @@ public object Utils {
         }
     }
 
+    public fun parseLogPrivacyLevel(privacyLevel: String): AirshipConfigOptions.PrivacyLevel {
+        return when (privacyLevel.lowercase().trim()) {
+            "public" -> AirshipConfigOptions.PrivacyLevel.PUBLIC
+            "private" -> AirshipConfigOptions.PrivacyLevel.PRIVATE
+            else -> {
+                throw JsonException("Invalid log privacy level: $privacyLevel")
+            }
+        }
+    }
+
+    public fun logPrivacyLevelString(privacyLevel: AirshipConfigOptions.PrivacyLevel): String {
+        return when (privacyLevel) {
+            AirshipConfigOptions.PrivacyLevel.PUBLIC -> "public"
+            AirshipConfigOptions.PrivacyLevel.PRIVATE -> "private"
+        }
+    }
+
     public fun parseFeatures(value: JsonValue): PrivacyManager.Feature {
         if (value.isJsonList) {
             return PrivacyManager.Feature.fromJson(value) ?: PrivacyManager.Feature.NONE

android/gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 
 # Airship
-airshipProxy = '14.5.0'
-airship = '19.9.0'
+airshipProxy = '14.5.1'
+airship = '19.9.1'
 
 # Gradle plugins
 androidGradlePlugin = '8.3.2'