felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 07:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge develop into steve/5020_matrixkit_merge

Browse Source
This commit is contained in:
SBiOSoftWhare
2021-11-30 16:16:52 +01:00
parent 56a51da9f9 20f1a6d238
commit 090e17c3f9
15 changed files with 155 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Riot/Modules/Settings/Security/SecurityViewController.m
View File

@@ -167,9 +167,8 @@ TableViewSectionsDelegate>
if (self.mainSession.crypto.backup)
{
MXDeviceInfo *deviceInfo = [self.mainSession.crypto.deviceList storedDevice:self.mainSession.matrixRestClient.credentials.userId
deviceId:self.mainSession.matrixRestClient.credentials.deviceId];
MXDeviceInfo *deviceInfo = [self.mainSession.crypto deviceWithDeviceId:self.mainSession.myDeviceId ofUser:self.mainSession.myUserId];
if (deviceInfo)
{
secureBackupSection = [[SettingsSecureBackupTableViewSection alloc] initWithRecoveryService:self.mainSession.crypto.recoveryService keyBackup:self.mainSession.crypto.backup userDevice:deviceInfo];