diff --git a/Frameworks/Bindings.txt b/Frameworks/Bindings.txt index 71d4cdcc695cfa1f74475cb87bf938d990484b98..7f92f1144bcbb2a4bcde62b6bf16f4af9749bcfb 100644 --- a/Frameworks/Bindings.txt +++ b/Frameworks/Bindings.txt @@ -1,4 +1,4 @@ -https://git.xx.network/elixxir/client/-/commit/12144ff4fa0bb0bf0308094c1353033cc75af3a0 +https://git.xx.network/elixxir/client/-/commit/a9465e95918dec73b9a9a19d9bddd70342ec0dee go version go1.17.13 darwin/arm64 Xcode 13.4.1 Build version 13F100 gomobile bind target: ios,iossimulator,macos diff --git a/Frameworks/Bindings.xcframework/Info.plist b/Frameworks/Bindings.xcframework/Info.plist index ab0338a02ded757edb59566001da4efa827302aa..3d81013ba0ba606da4b42b6f3119f688c6d9b97d 100644 --- a/Frameworks/Bindings.xcframework/Info.plist +++ b/Frameworks/Bindings.xcframework/Info.plist @@ -6,15 +6,18 @@ <array> <dict> <key>LibraryIdentifier</key> - <string>ios-arm64</string> + <string>ios-arm64_x86_64-simulator</string> <key>LibraryPath</key> <string>Bindings.framework</string> <key>SupportedArchitectures</key> <array> <string>arm64</string> + <string>x86_64</string> </array> <key>SupportedPlatform</key> <string>ios</string> + <key>SupportedPlatformVariant</key> + <string>simulator</string> </dict> <dict> <key>LibraryIdentifier</key> @@ -31,18 +34,15 @@ </dict> <dict> <key>LibraryIdentifier</key> - <string>ios-arm64_x86_64-simulator</string> + <string>ios-arm64</string> <key>LibraryPath</key> <string>Bindings.framework</string> <key>SupportedArchitectures</key> <array> <string>arm64</string> - <string>x86_64</string> </array> <key>SupportedPlatform</key> <string>ios</string> - <key>SupportedPlatformVariant</key> - <string>simulator</string> </dict> </array> <key>CFBundlePackageType</key> diff --git a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings index 8bbfe7e9f322e837ec6665ffd1ea4a478a98133b..83343f229a566312c27a0762e008dd610d257a30 100644 Binary files a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings and b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings differ diff --git a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Headers/Bindings.objc.h index 1d32aaf959f293467ac499bdc8cd5dd39fabc980..bcfdd5d849bc6350d895e8219f70780aa633588c 100644 --- a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Headers/Bindings.objc.h +++ b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Headers/Bindings.objc.h @@ -1432,6 +1432,7 @@ JSON example: @property (nonatomic) int64_t timestamp; @property (nonatomic) BOOL encrypted; @property (nonatomic) long roundId; +@property (nonatomic) NSString* _Nonnull roundURL; @end /** diff --git a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings index 0409f2c54516429447f076c565e9682988e099b1..6d7d38149c2efe11111ee97506961ac7b0920142 100644 Binary files a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings and b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings differ diff --git a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Headers/Bindings.objc.h index 1d32aaf959f293467ac499bdc8cd5dd39fabc980..bcfdd5d849bc6350d895e8219f70780aa633588c 100644 --- a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Headers/Bindings.objc.h +++ b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Headers/Bindings.objc.h @@ -1432,6 +1432,7 @@ JSON example: @property (nonatomic) int64_t timestamp; @property (nonatomic) BOOL encrypted; @property (nonatomic) long roundId; +@property (nonatomic) NSString* _Nonnull roundURL; @end /** diff --git a/Frameworks/Bindings.xcframework/macos-arm64_x86_64/Bindings.framework/Versions/A/Bindings b/Frameworks/Bindings.xcframework/macos-arm64_x86_64/Bindings.framework/Versions/A/Bindings index d59df29aaa7b4f2d93a378b4c129b1a5069ef869..1b014625141db40d4cbd0ad89f82a10d376fe435 100644 Binary files a/Frameworks/Bindings.xcframework/macos-arm64_x86_64/Bindings.framework/Versions/A/Bindings and b/Frameworks/Bindings.xcframework/macos-arm64_x86_64/Bindings.framework/Versions/A/Bindings differ diff --git a/Frameworks/Bindings.xcframework/macos-arm64_x86_64/Bindings.framework/Versions/A/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/macos-arm64_x86_64/Bindings.framework/Versions/A/Headers/Bindings.objc.h index 1d32aaf959f293467ac499bdc8cd5dd39fabc980..bcfdd5d849bc6350d895e8219f70780aa633588c 100644 --- a/Frameworks/Bindings.xcframework/macos-arm64_x86_64/Bindings.framework/Versions/A/Headers/Bindings.objc.h +++ b/Frameworks/Bindings.xcframework/macos-arm64_x86_64/Bindings.framework/Versions/A/Headers/Bindings.objc.h @@ -1432,6 +1432,7 @@ JSON example: @property (nonatomic) int64_t timestamp; @property (nonatomic) BOOL encrypted; @property (nonatomic) long roundId; +@property (nonatomic) NSString* _Nonnull roundURL; @end /** diff --git a/Sources/XXClient/Models/Message.swift b/Sources/XXClient/Models/Message.swift index 3abaec655124e10c8089249dac2c7170f416ed3c..55d43a770ee111d98340236e25dbecfaddbfea3c 100644 --- a/Sources/XXClient/Models/Message.swift +++ b/Sources/XXClient/Models/Message.swift @@ -10,7 +10,8 @@ public struct Message: Equatable { ephemeralId: Int, timestamp: Int, encrypted: Bool, - roundId: Int + roundId: Int, + roundURL: String ) { self.messageType = messageType self.id = id @@ -21,6 +22,7 @@ public struct Message: Equatable { self.timestamp = timestamp self.encrypted = encrypted self.roundId = roundId + self.roundURL = roundURL } public var messageType: Int @@ -32,6 +34,7 @@ public struct Message: Equatable { public var timestamp: Int public var encrypted: Bool public var roundId: Int + public var roundURL: String } extension Message: Codable { @@ -45,6 +48,7 @@ extension Message: Codable { case timestamp = "Timestamp" case encrypted = "Encrypted" case roundId = "RoundId" + case roundURL = "RoundURL" } public static func decode(_ data: Data) throws -> Self { diff --git a/Tests/XXClientTests/Models/MessageTests.swift b/Tests/XXClientTests/Models/MessageTests.swift index b62cf20f1254fac05f88b33227dec438bab4563c..6a0012e01d38db500e65ceb2dd9c6d99c5620526 100644 --- a/Tests/XXClientTests/Models/MessageTests.swift +++ b/Tests/XXClientTests/Models/MessageTests.swift @@ -13,6 +13,7 @@ final class MessageTests: XCTestCase { let timestamp: Int = 1_653_580_439_357_351_000 let encrypted = false let roundId: Int = 19 + let roundURL = "https://dashboard.xx.network/rounds/25?xxmessenger=true" let jsonString = """ { "MessageType": \(type), @@ -23,7 +24,8 @@ final class MessageTests: XCTestCase { "EphemeralID": \(ephemeralId), "Timestamp": \(timestamp), "Encrypted": \(encrypted), - "RoundId": \(roundId) + "RoundId": \(roundId), + "RoundURL": "\(roundURL)" } """ let jsonData = jsonString.data(using: .utf8)! @@ -38,7 +40,8 @@ final class MessageTests: XCTestCase { ephemeralId: ephemeralId, timestamp: timestamp, encrypted: encrypted, - roundId: roundId + roundId: roundId, + roundURL: roundURL )) let encodedModel = try model.encode()