-
Notifications
You must be signed in to change notification settings - Fork 212
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/0.19.3/master'
- Loading branch information
Showing
38 changed files
with
2,246 additions
and
265 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // | ||
| // Copyright 2021 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /** | ||
| Data class that contains the pickled Olm account and the pickle key retrieved from the rehydration process. | ||
| */ | ||
| @interface MXExportedOlmDevice : NSObject | ||
|
|
||
| /// Olm account pickled with the pickle key | ||
| @property (nonatomic, nonnull) NSString *pickledAccount; | ||
| /// Key to be used to unpickle the account | ||
| @property (nonatomic, nonnull) NSData *pickleKey; | ||
| /// Sessions the Olm account belongs to | ||
| @property (nonatomic, nonnull) NSArray *sessions; | ||
|
|
||
| - (instancetype)initWithAccount:(NSString*)pickledAccount | ||
| pickleKey:(NSData*)pickleKey | ||
| forSessions:(NSArray*)sessions; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // | ||
| // Copyright 2021 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #import "MXExportedOlmDevice.h" | ||
|
|
||
| @implementation MXExportedOlmDevice | ||
|
|
||
| - (instancetype)initWithAccount:(NSString*)pickledAccount | ||
| pickleKey:(NSData*)pickleKey | ||
| forSessions:(NSArray*)sessions | ||
| { | ||
| self = [super init]; | ||
|
|
||
| if (self) | ||
| { | ||
| self.pickledAccount = pickledAccount; | ||
| self.pickleKey = pickleKey; | ||
| self.sessions = sessions; | ||
| } | ||
|
|
||
| return self; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // | ||
| // Copyright 2021 The Matrix.org Foundation C.I.C | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| @import Foundation; | ||
|
|
||
| @class MXCrypto; | ||
| @class MXRestClient; | ||
| @class MXExportedOlmDevice; | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /// ID of the algorithm used for the dehydration | ||
| FOUNDATION_EXPORT NSString *const MXDehydrationAlgorithm; | ||
|
|
||
| /// MXKeyProvider identifier for a 32 bytes long key used to pickle / unpickle the account of the dehydrated device. | ||
| FOUNDATION_EXPORT NSString *const MXDehydrationServiceKeyDataType; | ||
|
|
||
| /// Error domain for this class. | ||
| FOUNDATION_EXPORT NSString *const MXDehydrationServiceErrorDomain; | ||
| typedef NS_ENUM(NSInteger, MXDehydrationServiceErrorCode) | ||
| { | ||
| MXDehydrationServiceAlreadyRuninngErrorCode, | ||
| MXDehydrationServiceNothingToRehydrateErrorCode, | ||
| MXDehydrationServiceAlreadyClaimedErrorCode, | ||
| }; | ||
|
|
||
| /** | ||
| Service in charge of dehydrating and rehydrating a device. | ||
| @see https://github.com/uhoreg/matrix-doc/blob/dehydration/proposals/2697-device-dehydration.md for more details | ||
| */ | ||
| @interface MXDehydrationService : NSObject | ||
|
|
||
| @property (nonatomic, readonly) BOOL inProgress; | ||
|
|
||
| /** | ||
| Dehydrate a new device for the current account | ||
| @param restClient client used to call the dehydration API | ||
| @param crypto crypto used to self sign the dehydrated device | ||
| @param dehydrationKey key used to pickle the Olm account | ||
| @param success callback called in case of success | ||
| @param failure callback called in case of unexpected failure | ||
| */ | ||
| - (void)dehydrateDeviceWithMatrixRestClient:(MXRestClient*)restClient | ||
| crypto:(MXCrypto*)crypto | ||
| dehydrationKey:(NSData*)dehydrationKey | ||
| success:(void (^)(NSString * deviceId))success | ||
| failure:(void (^)(NSError *error))failure; | ||
|
|
||
| /** | ||
| Rehydrate the dehydrated device of the current acount | ||
| @param restClient client used to call the dehydration API | ||
| @param dehydrationKey key used to unpickle the Olm account | ||
| @param success callback called in case of success | ||
| @param failure callback called in case of unexpected failure | ||
| */ | ||
| - (void)rehydrateDeviceWithMatrixRestClient:(MXRestClient*)restClient | ||
| dehydrationKey:(NSData*)dehydrationKey | ||
| success:(void (^)(NSString * deviceId))success | ||
| failure:(void (^)(NSError *error))failure; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
Oops, something went wrong.