Skip to content

Commit 08e980c

Browse files
authored
Merge pull request #136 from urbanairship/add-embedded-instance-info
Expose instance id, priority, and extras in pending embedded event
2 parents b5abb66 + 32e9954 commit 08e980c

4 files changed

Lines changed: 23 additions & 4 deletions

File tree

AirshipFrameworkProxy.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Pod::Spec.new do |s|
3-
s.version = "15.11.0"
3+
s.version = "15.12.0"
44
s.name = "AirshipFrameworkProxy"
55
s.summary = "Airship iOS mobile framework proxy"
66
s.documentation_url = "https://docs.airship.com/platform/mobile"

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ internal class PendingEmbeddedUpdated(pending: List<AirshipEmbeddedInfo>) : Even
1010
override val type = EventType.PENDING_EMBEDDED_UPDATED
1111

1212
override val body: JsonMap = jsonMapOf(
13-
"pending" to pending.map { jsonMapOf( "embeddedId" to it.embeddedId ) }
13+
"pending" to pending.map {
14+
jsonMapOf(
15+
"embeddedId" to it.embeddedId,
16+
"instanceId" to it.instanceId,
17+
"priority" to it.priority,
18+
"extras" to it.extras
19+
)
20+
}
1421
)
1522
}

android/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22

33
# Airship
4-
airshipProxy = '15.11.0'
4+
airshipProxy = '15.12.0'
55
airship = '20.9.0'
66

77
# Gradle plugins

ios/AirshipFrameworkProxy/AirshipProxyEvent.swift

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,16 @@ struct EmbeddedInfoUpdatedEvent: AirshipProxyEvent {
215215
let body: Body
216216

217217
init(pending: [AirshipEmbeddedInfo]) {
218-
self.body = Body(pending: pending.map { Embedded(embeddedId: $0.embeddedID) })
218+
self.body = Body(
219+
pending: pending.map {
220+
Embedded(
221+
embeddedId: $0.embeddedID,
222+
instanceId: $0.instanceID,
223+
priority: $0.priority,
224+
extras: $0.extras
225+
)
226+
}
227+
)
219228
}
220229

221230
struct Body: Codable, Sendable {
@@ -224,6 +233,9 @@ struct EmbeddedInfoUpdatedEvent: AirshipProxyEvent {
224233

225234
struct Embedded: Codable, Sendable {
226235
let embeddedId: String
236+
let instanceId: String
237+
let priority: Int
238+
let extras: AirshipJSON?
227239
}
228240
}
229241

0 commit comments

Comments
 (0)