diff --git a/Frameworks/Bindings.txt b/Frameworks/Bindings.txt index 62e138311fc4c3669e1c43a81fbc99bb5dcb67f0..a5431f62c1ebe21d09d1dc4f609978ce97f7ee3d 100644 --- a/Frameworks/Bindings.txt +++ b/Frameworks/Bindings.txt @@ -1,4 +1,4 @@ -https://git.xx.network/elixxir/client/-/commit/66798228e0fc334287cea1fa0d0bcacfdde5c109 +https://git.xx.network/elixxir/client/-/commit/730d7cd8e9333143cc9fd94de8611861450c9f82 go version go1.17.13 darwin/arm64 Xcode 14.0.1 Build version 14A400 gomobile bind target: ios,iossimulator,macos diff --git a/Frameworks/Bindings.xcframework/Info.plist b/Frameworks/Bindings.xcframework/Info.plist index 1e6b67e7e5ab26303902b1288f432c61b61a6f28..e66824e5243985b4ac053ef62aeaaf571fe03970 100644 --- a/Frameworks/Bindings.xcframework/Info.plist +++ b/Frameworks/Bindings.xcframework/Info.plist @@ -6,30 +6,30 @@ <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> - <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> <dict> <key>LibraryIdentifier</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 d42c77a03d95d2178cd61657c63bcc79d8d5dc47..11bc65b9458a47c5168c044c5c2e9aeb5079521a 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 86749f1498e93490d371a0e779b1c9000b6abb05..73defbbf6e76c0043035efc5c5ec165747ff20cc 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 @@ -132,7 +132,7 @@ Parameters: @end @protocol BindingsGroupChatProcessor <NSObject> -- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId err:(NSError* _Nullable)err; +- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId roundUrl:(NSString* _Nullable)roundUrl err:(NSError* _Nullable)err; - (NSString* _Nonnull)string; @end @@ -2593,7 +2593,7 @@ The decryptedMessage field will be a JSON marshalled GroupChatMessage. @property(strong, readonly) _Nonnull id _ref; - (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId err:(NSError* _Nullable)err; +- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId roundUrl:(NSString* _Nullable)roundUrl err:(NSError* _Nullable)err; - (NSString* _Nonnull)string; @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 828791cd7694e08a35f2a8caa061054e11cd11a2..2514d4ed68f5c18e8285457d59f2f1c7c47bd313 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 86749f1498e93490d371a0e779b1c9000b6abb05..73defbbf6e76c0043035efc5c5ec165747ff20cc 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 @@ -132,7 +132,7 @@ Parameters: @end @protocol BindingsGroupChatProcessor <NSObject> -- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId err:(NSError* _Nullable)err; +- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId roundUrl:(NSString* _Nullable)roundUrl err:(NSError* _Nullable)err; - (NSString* _Nonnull)string; @end @@ -2593,7 +2593,7 @@ The decryptedMessage field will be a JSON marshalled GroupChatMessage. @property(strong, readonly) _Nonnull id _ref; - (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId err:(NSError* _Nullable)err; +- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId roundUrl:(NSString* _Nullable)roundUrl err:(NSError* _Nullable)err; - (NSString* _Nonnull)string; @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 389bbc3b09271296c6051e4d77f16a59275e7686..821b8c1854604a15ed47e44709e5cffae8108b75 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 86749f1498e93490d371a0e779b1c9000b6abb05..73defbbf6e76c0043035efc5c5ec165747ff20cc 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 @@ -132,7 +132,7 @@ Parameters: @end @protocol BindingsGroupChatProcessor <NSObject> -- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId err:(NSError* _Nullable)err; +- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId roundUrl:(NSString* _Nullable)roundUrl err:(NSError* _Nullable)err; - (NSString* _Nonnull)string; @end @@ -2593,7 +2593,7 @@ The decryptedMessage field will be a JSON marshalled GroupChatMessage. @property(strong, readonly) _Nonnull id _ref; - (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId err:(NSError* _Nullable)err; +- (void)process:(NSData* _Nullable)decryptedMessage msg:(NSData* _Nullable)msg receptionId:(NSData* _Nullable)receptionId ephemeralId:(int64_t)ephemeralId roundId:(int64_t)roundId roundUrl:(NSString* _Nullable)roundUrl err:(NSError* _Nullable)err; - (NSString* _Nonnull)string; @end diff --git a/Sources/XXClient/Callbacks/GroupChatProcessor.swift b/Sources/XXClient/Callbacks/GroupChatProcessor.swift index e6ab9ee4d8535a1fb8048e6713dc99d4730e512b..f303aae49186ab75df7a796f735e129027367ec6 100644 --- a/Sources/XXClient/Callbacks/GroupChatProcessor.swift +++ b/Sources/XXClient/Callbacks/GroupChatProcessor.swift @@ -8,13 +8,15 @@ public struct GroupChatProcessor { msg: Data, receptionId: Data, ephemeralId: Int64, - roundId: Int64 + roundId: Int64, + roundUrl: String ) { self.decryptedMessage = decryptedMessage self.msg = msg self.receptionId = receptionId self.ephemeralId = ephemeralId self.roundId = roundId + self.roundUrl = roundUrl } public var decryptedMessage: GroupChatMessage @@ -22,6 +24,7 @@ public struct GroupChatProcessor { public var receptionId: Data public var ephemeralId: Int64 public var roundId: Int64 + public var roundUrl: String } public init( @@ -58,28 +61,33 @@ extension GroupChatProcessor { receptionId: Data?, ephemeralId: Int64, roundId: Int64, + roundUrl: String?, err: Error? ) { if let err = err { callback.handle(.failure(err as NSError)) return } - guard let decryptedMessage = decryptedMessage else { + guard let decryptedMessage else { fatalError("BindingsGroupChatProcessor received `nil` decryptedMessage") } - guard let msg = msg else { + guard let msg else { fatalError("BindingsGroupChatProcessor received `nil` msg") } - guard let receptionId = receptionId else { + guard let receptionId else { fatalError("BindingsGroupChatProcessor received `nil` receptionId") } + guard let roundUrl else { + fatalError("BindingsGroupChatProcessor received `nil` roundUrl") + } do { callback.handle(.success(.init( decryptedMessage: try GroupChatMessage.decode(decryptedMessage), msg: msg, receptionId: receptionId, ephemeralId: ephemeralId, - roundId: roundId + roundId: roundId, + roundUrl: roundUrl ))) } catch { callback.handle(.failure(error as NSError))