Skip to content

Commit

Permalink
Merge branch 'release/0.27.7/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
pixlwave committed May 1, 2024
2 parents 9e6a0da + d79b661 commit 26764b1
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## Changes in 0.27.7 (2024-05-01)

No significant changes.


## Changes in 0.27.6 (2024-02-07)

No significant changes.
Expand Down
2 changes: 1 addition & 1 deletion MatrixSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "MatrixSDK"
s.version = "0.27.6"
s.version = "0.27.7"
s.summary = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"

s.description = <<-DESC
Expand Down
6 changes: 6 additions & 0 deletions MatrixSDK/Crypto/MXCrypto.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ extern NSString *const MXDeviceListDidUpdateUsersDevicesNotification;
*/
@property (nullable, nonatomic, readonly) NSString *deviceEd25519Key;


/**
* The user device creation in local timestamp, milliseconds since epoch.
*/
@property (nonatomic, readonly) UInt64 deviceCreationTs;

/**
The key backup manager.
*/
Expand Down
6 changes: 6 additions & 0 deletions MatrixSDK/Crypto/MXCrypto.m
Original file line number Diff line number Diff line change
Expand Up @@ -1422,6 +1422,12 @@ - (NSString *)olmVersion
#endif
}

- (uint64_t)deviceCreationTs
{
// Device creation timestamp is not support in legacy crypto
return 0;
}


#pragma mark - Gossipping

Expand Down
5 changes: 5 additions & 0 deletions MatrixSDK/Crypto/MXCryptoV2.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ class MXCryptoV2: NSObject, MXCrypto {
return machine.deviceEd25519Key
}

var deviceCreationTs: UInt64 {
// own device always exists
return machine.device(userId: machine.userId, deviceId: machine.deviceId)!.firstTimeSeenTs
}

let backup: MXKeyBackup?
let keyVerificationManager: MXKeyVerificationManager
let crossSigning: MXCrossSigning
Expand Down
2 changes: 1 addition & 1 deletion MatrixSDK/MatrixSDKVersion.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

#import <Foundation/Foundation.h>

NSString *const MatrixSDKVersion = @"0.27.6";
NSString *const MatrixSDKVersion = @"0.27.7";

0 comments on commit 26764b1

Please sign in to comment.