diff --git a/Frameworks/Bindings.txt b/Frameworks/Bindings.txt index 0ba5eba4c0b5434051e4b97bc071beaaf4bbee30..152444e86b795f487dc8444f66e95c6d0baef923 100644 --- a/Frameworks/Bindings.txt +++ b/Frameworks/Bindings.txt @@ -1,4 +1,4 @@ -https://git.xx.network/elixxir/client/-/commit/6bfab4444984a061837f4f2132cef11412a50d97 +https://git.xx.network/elixxir/client/-/commit/e42c84215d580d3ba67c171b601e1caef8e74249 go version go1.19.3 darwin/arm64 Xcode 14.1 Build version 14B47b gomobile bind target: ios,iossimulator,macos 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 3b0ce816d035f24824aaafc849e1a6c1c7156163..0a2d808c003754321d6ebece3fcb217437b5c83e 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 1961b0441d97c40e5a243f09d0db45a24090008f..5ef1f9b380057f5619cbfa5de176fb5a956c1ec6 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 @@ -1037,16 +1037,26 @@ most likely be in an unrecoverable state and need to be trashed. * TrackServices will return via a callback the list of services the backend keeps track of, which is formally referred to as a [message.ServiceList]. This may be passed into other bindings call which -may need context on the available services for this client. This is the equivalent -of GetPreimages in APIv0. The callback will be called every time a new service -is added or an existing service is deleted. This serves as a way for -the caller to have the most up-to-date list of existing services. +may need context on the available services for this client. This will +provide services for all identities that the client tracks. Parameters: - cb - A TrackServicesCallback, which will be passed the marshalled message.ServiceList. */ - (void)trackServices:(id<BindingsTrackServicesCallback> _Nullable)cb; +/** + * TrackServicesWithIdentity will return via a callback the list of services the +backend keeps track of for the provided identity. This may be passed into +other bindings call which may need context on the available services for this +single identity. This will only return services for the given identity. + +Parameters: + - e2eID - e2e object ID in the tracker. + - cb - A TrackServicesCallback, which will be passed the marshalled + message.ServiceList. + */ +- (BOOL)trackServicesWithIdentity:(long)e2eId cb:(id<BindingsTrackServicesCallback> _Nullable)cb error:(NSError* _Nullable* _Nullable)error; /** * WaitForNetwork will block until either the network is healthy or the passed timeout is reached. It will return true if the network is healthy. @@ -2722,19 +2732,18 @@ notifications are for this user. // This returns the JSON-marshalled NotificationReports. Parameters: - - e2eID - e2e object ID in the tracker - notificationCSV - the notification data received from the notifications' server. - marshalledServices - the JSON-marshalled list of services the backend - keeps track of. Refer to Cmix.TrackServices for information about this. This - is the equivalent to preimages in APIv0. + keeps track of. Refer to Cmix.TrackServices or + Cmix.TrackServicesWithIdentity for information about this. Returns: - []byte - A JSON marshalled NotificationReports. Some NotificationReport's within in this structure may have their NotificationReport.ForMe set to false. These may be ignored. */ -FOUNDATION_EXPORT NSData* _Nullable BindingsGetNotificationsReport(long e2eId, NSString* _Nullable notificationCSV, NSData* _Nullable marshalledServices, NSError* _Nullable* _Nullable error); +FOUNDATION_EXPORT NSData* _Nullable BindingsGetNotificationsReport(NSString* _Nullable notificationCSV, NSData* _Nullable marshalledServices, NSError* _Nullable* _Nullable error); /** * GetPubkeyFromContact returns the DH public key in the [contact.Contact] 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 fb5914ba4565ef2ef60df876c2851eb851b5100c..c39e9ee29bcd3c897f6e85073c194f0e26d20894 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 1961b0441d97c40e5a243f09d0db45a24090008f..5ef1f9b380057f5619cbfa5de176fb5a956c1ec6 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 @@ -1037,16 +1037,26 @@ most likely be in an unrecoverable state and need to be trashed. * TrackServices will return via a callback the list of services the backend keeps track of, which is formally referred to as a [message.ServiceList]. This may be passed into other bindings call which -may need context on the available services for this client. This is the equivalent -of GetPreimages in APIv0. The callback will be called every time a new service -is added or an existing service is deleted. This serves as a way for -the caller to have the most up-to-date list of existing services. +may need context on the available services for this client. This will +provide services for all identities that the client tracks. Parameters: - cb - A TrackServicesCallback, which will be passed the marshalled message.ServiceList. */ - (void)trackServices:(id<BindingsTrackServicesCallback> _Nullable)cb; +/** + * TrackServicesWithIdentity will return via a callback the list of services the +backend keeps track of for the provided identity. This may be passed into +other bindings call which may need context on the available services for this +single identity. This will only return services for the given identity. + +Parameters: + - e2eID - e2e object ID in the tracker. + - cb - A TrackServicesCallback, which will be passed the marshalled + message.ServiceList. + */ +- (BOOL)trackServicesWithIdentity:(long)e2eId cb:(id<BindingsTrackServicesCallback> _Nullable)cb error:(NSError* _Nullable* _Nullable)error; /** * WaitForNetwork will block until either the network is healthy or the passed timeout is reached. It will return true if the network is healthy. @@ -2722,19 +2732,18 @@ notifications are for this user. // This returns the JSON-marshalled NotificationReports. Parameters: - - e2eID - e2e object ID in the tracker - notificationCSV - the notification data received from the notifications' server. - marshalledServices - the JSON-marshalled list of services the backend - keeps track of. Refer to Cmix.TrackServices for information about this. This - is the equivalent to preimages in APIv0. + keeps track of. Refer to Cmix.TrackServices or + Cmix.TrackServicesWithIdentity for information about this. Returns: - []byte - A JSON marshalled NotificationReports. Some NotificationReport's within in this structure may have their NotificationReport.ForMe set to false. These may be ignored. */ -FOUNDATION_EXPORT NSData* _Nullable BindingsGetNotificationsReport(long e2eId, NSString* _Nullable notificationCSV, NSData* _Nullable marshalledServices, NSError* _Nullable* _Nullable error); +FOUNDATION_EXPORT NSData* _Nullable BindingsGetNotificationsReport(NSString* _Nullable notificationCSV, NSData* _Nullable marshalledServices, NSError* _Nullable* _Nullable error); /** * GetPubkeyFromContact returns the DH public key in the [contact.Contact] 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 a2c39858c2effaf8ff2e59657cb06ba5e7549f97..f923c3b33d55e72f839d4963e0337aec72202956 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 1961b0441d97c40e5a243f09d0db45a24090008f..5ef1f9b380057f5619cbfa5de176fb5a956c1ec6 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 @@ -1037,16 +1037,26 @@ most likely be in an unrecoverable state and need to be trashed. * TrackServices will return via a callback the list of services the backend keeps track of, which is formally referred to as a [message.ServiceList]. This may be passed into other bindings call which -may need context on the available services for this client. This is the equivalent -of GetPreimages in APIv0. The callback will be called every time a new service -is added or an existing service is deleted. This serves as a way for -the caller to have the most up-to-date list of existing services. +may need context on the available services for this client. This will +provide services for all identities that the client tracks. Parameters: - cb - A TrackServicesCallback, which will be passed the marshalled message.ServiceList. */ - (void)trackServices:(id<BindingsTrackServicesCallback> _Nullable)cb; +/** + * TrackServicesWithIdentity will return via a callback the list of services the +backend keeps track of for the provided identity. This may be passed into +other bindings call which may need context on the available services for this +single identity. This will only return services for the given identity. + +Parameters: + - e2eID - e2e object ID in the tracker. + - cb - A TrackServicesCallback, which will be passed the marshalled + message.ServiceList. + */ +- (BOOL)trackServicesWithIdentity:(long)e2eId cb:(id<BindingsTrackServicesCallback> _Nullable)cb error:(NSError* _Nullable* _Nullable)error; /** * WaitForNetwork will block until either the network is healthy or the passed timeout is reached. It will return true if the network is healthy. @@ -2722,19 +2732,18 @@ notifications are for this user. // This returns the JSON-marshalled NotificationReports. Parameters: - - e2eID - e2e object ID in the tracker - notificationCSV - the notification data received from the notifications' server. - marshalledServices - the JSON-marshalled list of services the backend - keeps track of. Refer to Cmix.TrackServices for information about this. This - is the equivalent to preimages in APIv0. + keeps track of. Refer to Cmix.TrackServices or + Cmix.TrackServicesWithIdentity for information about this. Returns: - []byte - A JSON marshalled NotificationReports. Some NotificationReport's within in this structure may have their NotificationReport.ForMe set to false. These may be ignored. */ -FOUNDATION_EXPORT NSData* _Nullable BindingsGetNotificationsReport(long e2eId, NSString* _Nullable notificationCSV, NSData* _Nullable marshalledServices, NSError* _Nullable* _Nullable error); +FOUNDATION_EXPORT NSData* _Nullable BindingsGetNotificationsReport(NSString* _Nullable notificationCSV, NSData* _Nullable marshalledServices, NSError* _Nullable* _Nullable error); /** * GetPubkeyFromContact returns the DH public key in the [contact.Contact]