diff --git a/Frameworks/Bindings.txt b/Frameworks/Bindings.txt index 6fea50f1471b3500d5e78bfbe2757f5a5f3a70bd..38f1055fcd434f0facef06268d75084a2f223620 100644 --- a/Frameworks/Bindings.txt +++ b/Frameworks/Bindings.txt @@ -1,4 +1,4 @@ -https://git.xx.network/elixxir/client/-/commit/a70dac7e6cd783e37be0dd3f91919acd9f973e9e +https://git.xx.network/elixxir/client/-/commit/d6f371bde264c048c9e2ceab5cbad0b973eefe81 go version go1.17.13 darwin/arm64 Xcode 14.0 Build version 14A309 gomobile bind target: ios,iossimulator,macos diff --git a/Frameworks/Bindings.xcframework/Info.plist b/Frameworks/Bindings.xcframework/Info.plist index deb2b9ab75cf32a71a0876630c4fbc5c5532b607..1e6b67e7e5ab26303902b1288f432c61b61a6f28 100644 --- a/Frameworks/Bindings.xcframework/Info.plist +++ b/Frameworks/Bindings.xcframework/Info.plist @@ -6,32 +6,34 @@ <array> <dict> <key>LibraryIdentifier</key> - <string>macos-arm64_x86_64</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>macos</string> + <string>ios</string> </dict> <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>macos-arm64_x86_64</string> <key>LibraryPath</key> <string>Bindings.framework</string> <key>SupportedArchitectures</key> @@ -40,9 +42,7 @@ <string>x86_64</string> </array> <key>SupportedPlatform</key> - <string>ios</string> - <key>SupportedPlatformVariant</key> - <string>simulator</string> + <string>macos</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 a2c23803b173a84e8b76cc77289cab5476164316..1d7e6e806517a62b5137bcd181a4885e089f66c7 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 2598d8aa6f079549a85d885bc8b92c6f8ce0f5cb..389f151c7e4a79dad00bdf7799c1c6cb88fcafec 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 @@ -1169,12 +1169,14 @@ Parameters: - recipientID - marshalled recipient id.ID - retry - number of retries allowed - callback - callback that reports file sending progress - - period - duration to wait between progress callbacks triggering + - period - Duration (in ms) to wait between progress callbacks triggering. + This value should depend on how frequently you want to receive + updates, and should be tuned to your implementation. Returns: - []byte - unique file transfer ID */ -- (NSData* _Nullable)send:(NSData* _Nullable)payload recipientID:(NSData* _Nullable)recipientID retry:(float)retry callback:(id<BindingsFileTransferSentProgressCallback> _Nullable)callback period:(NSString* _Nullable)period error:(NSError* _Nullable* _Nullable)error; +- (NSData* _Nullable)send:(NSData* _Nullable)payload recipientID:(NSData* _Nullable)recipientID retry:(float)retry callback:(id<BindingsFileTransferSentProgressCallback> _Nullable)callback period:(long)period error:(NSError* _Nullable* _Nullable)error; @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 2c83bf7701115d1a887861e4be349e8b72c4686f..557c80c4a0e93a5be2e13626c0ea8d4d8c970b94 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 2598d8aa6f079549a85d885bc8b92c6f8ce0f5cb..389f151c7e4a79dad00bdf7799c1c6cb88fcafec 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 @@ -1169,12 +1169,14 @@ Parameters: - recipientID - marshalled recipient id.ID - retry - number of retries allowed - callback - callback that reports file sending progress - - period - duration to wait between progress callbacks triggering + - period - Duration (in ms) to wait between progress callbacks triggering. + This value should depend on how frequently you want to receive + updates, and should be tuned to your implementation. Returns: - []byte - unique file transfer ID */ -- (NSData* _Nullable)send:(NSData* _Nullable)payload recipientID:(NSData* _Nullable)recipientID retry:(float)retry callback:(id<BindingsFileTransferSentProgressCallback> _Nullable)callback period:(NSString* _Nullable)period error:(NSError* _Nullable* _Nullable)error; +- (NSData* _Nullable)send:(NSData* _Nullable)payload recipientID:(NSData* _Nullable)recipientID retry:(float)retry callback:(id<BindingsFileTransferSentProgressCallback> _Nullable)callback period:(long)period error:(NSError* _Nullable* _Nullable)error; @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 d1b609f49fbf7a97dd9a0462f452ed83235ad238..ff9e3a6be9272589f98bab355e0ed41892d04784 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 2598d8aa6f079549a85d885bc8b92c6f8ce0f5cb..389f151c7e4a79dad00bdf7799c1c6cb88fcafec 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 @@ -1169,12 +1169,14 @@ Parameters: - recipientID - marshalled recipient id.ID - retry - number of retries allowed - callback - callback that reports file sending progress - - period - duration to wait between progress callbacks triggering + - period - Duration (in ms) to wait between progress callbacks triggering. + This value should depend on how frequently you want to receive + updates, and should be tuned to your implementation. Returns: - []byte - unique file transfer ID */ -- (NSData* _Nullable)send:(NSData* _Nullable)payload recipientID:(NSData* _Nullable)recipientID retry:(float)retry callback:(id<BindingsFileTransferSentProgressCallback> _Nullable)callback period:(NSString* _Nullable)period error:(NSError* _Nullable* _Nullable)error; +- (NSData* _Nullable)send:(NSData* _Nullable)payload recipientID:(NSData* _Nullable)recipientID retry:(float)retry callback:(id<BindingsFileTransferSentProgressCallback> _Nullable)callback period:(long)period error:(NSError* _Nullable* _Nullable)error; @end /** diff --git a/Sources/XXClient/FileTransfer/Functions/FileTransferSend.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferSend.swift index 1f6e72e4a49f91d13440350b03c8ff82c1389f32..2b945cb4c9033ce1de4f340b3bd02f728148731b 100644 --- a/Sources/XXClient/FileTransfer/Functions/FileTransferSend.swift +++ b/Sources/XXClient/FileTransfer/Functions/FileTransferSend.swift @@ -7,7 +7,7 @@ public struct FileTransferSend { payload: FileSend, recipientId: Data, retry: Float, - period: String + period: Int ) { self.payload = payload self.recipientId = recipientId @@ -18,7 +18,7 @@ public struct FileTransferSend { public var payload: FileSend public var recipientId: Data public var retry: Float - public var period: String + public var period: Int } public var run: (Params, FileTransferProgressCallback) throws -> Data