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

Fix Manu's remarks.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-06-25 17:31:46 +02:00
parent 8c047b47f5
commit a028e71aff
6 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
+6 -6
View File
@@ -33,13 +33,13 @@ typedef enum : NSUInteger
} RecentsDataSourceMode;
/**
List the different key backup banners that could be displayed.
List the different secure key backup banners that could be displayed.
*/
typedef NS_ENUM(NSInteger, KeyBackupBanner)
typedef NS_ENUM(NSInteger, SecureKeyBackupBannerDisplay)
{
KeyBackupBannerNone,
KeyBackupBannerSetup,
KeyBackupBannerRecover
SecureKeyBackupBannerDisplayNone,
SecureKeyBackupBannerDisplaySetup,
SecureKeyBackupBannerDisplayRecover
};
/**
@@ -71,7 +71,7 @@ extern NSString *const kRecentsDataSourceTapOnDirectoryServerChange;
@property (nonatomic, readonly) NSArray* lowPriorityCellDataArray;
@property (nonatomic, readonly) NSArray* serverNoticeCellDataArray;
@property (nonatomic, readonly) KeyBackupBanner keyBackupBanner;
@property (nonatomic, readonly) SecureKeyBackupBannerDisplay secureKeyBackupBannerDisplay;
/**
Set the delegate by specifying the selected display mode.
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+18 -18
View File
@@ -64,7 +64,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
NSTimer *publicRoomsTriggerTimer;
}
@property (nonatomic, assign, readwrite) KeyBackupBanner keyBackupBanner;
@property (nonatomic, assign, readwrite) SecureKeyBackupBannerDisplay secureKeyBackupBannerDisplay;
@end
@@ -86,7 +86,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
conversationCellDataArray = [[NSMutableArray alloc] init];
_keyBackupBanner = KeyBackupBannerNone;
_secureKeyBackupBannerDisplay = SecureKeyBackupBannerDisplayNone;
keyBackupBannerSection = -1;
directorySection = -1;
invitesSection = -1;
@@ -130,7 +130,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
[self unregisterKeyBackupStateDidChangeNotification];
}
[self updateKeyBackupBanner];
[self updateSecureKeyBackupBanner];
[self forceRefresh];
}
@@ -169,15 +169,15 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
- (void)keyBackupStateDidChangeNotification:(NSNotification*)notification
{
if ([self updateKeyBackupBanner])
if ([self updateSecureKeyBackupBanner])
{
[self forceRefresh];
}
}
- (BOOL)updateKeyBackupBanner
- (BOOL)updateSecureKeyBackupBanner
{
KeyBackupBanner keyBackupBanner = KeyBackupBannerNone;
SecureKeyBackupBannerDisplay keyBackupBanner = SecureKeyBackupBannerDisplayNone;
if (self.recentsDataSourceMode == RecentsDataSourceModeHome)
{
@@ -185,26 +185,26 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
if (!keyBackupBannersPreferences.hideSetupBanner && [self.mxSession vc_canSetupSecureKeyBackup])
{
keyBackupBanner = KeyBackupBannerSetup;
keyBackupBanner = SecureKeyBackupBannerDisplaySetup;
}
}
BOOL updated = (self.keyBackupBanner != keyBackupBanner);
BOOL updated = (self.secureKeyBackupBannerDisplay != keyBackupBanner);
self.keyBackupBanner = keyBackupBanner;
self.secureKeyBackupBannerDisplay = keyBackupBanner;
return updated;
}
- (void)hideKeyBackupBanner:(KeyBackupBanner)keyBackupBanner
- (void)hideKeyBackupBannerWithDisplay:(SecureKeyBackupBannerDisplay)secureKeyBackupBannerDisplay
{
KeyBackupBannerPreferences *keyBackupBannersPreferences = KeyBackupBannerPreferences.shared;
switch (keyBackupBanner) {
case KeyBackupBannerSetup:
switch (secureKeyBackupBannerDisplay) {
case SecureKeyBackupBannerDisplaySetup:
keyBackupBannersPreferences.hideSetupBanner = YES;
break;
case KeyBackupBannerRecover:
case SecureKeyBackupBannerDisplayRecover:
{
NSString *keyBackupVersion = self.mxSession.crypto.backup.keyBackupVersion.version;
if (keyBackupVersion)
@@ -217,7 +217,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
break;
}
[self updateKeyBackupBanner];
[self updateSecureKeyBackupBanner];
[self forceRefresh];
}
@@ -337,7 +337,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
{
keyBackupBannerSection = directorySection = favoritesSection = peopleSection = conversationSection = lowPrioritySection = invitesSection = serverNoticeSection = -1;
if (self.keyBackupBanner != KeyBackupBannerNone)
if (self.secureKeyBackupBannerDisplay != SecureKeyBackupBannerDisplayNone)
{
self.keyBackupBannerSection = sectionsCount++;
}
@@ -394,7 +394,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
NSUInteger count = 0;
if (section == self.keyBackupBannerSection && self.keyBackupBanner != KeyBackupBannerNone)
if (section == self.keyBackupBannerSection && self.secureKeyBackupBannerDisplay != SecureKeyBackupBannerDisplayNone)
{
count = 1;
}
@@ -758,7 +758,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
if (indexPath.section == self.keyBackupBannerSection)
{
KeyBackupBannerCell* keyBackupBannerCell = [tableView dequeueReusableCellWithIdentifier:KeyBackupBannerCell.defaultReuseIdentifier forIndexPath:indexPath];
[keyBackupBannerCell configureFor:self.keyBackupBanner];
[keyBackupBannerCell configureFor:self.secureKeyBackupBannerDisplay];
keyBackupBannerCell.delegate = self;
return keyBackupBannerCell;
}
@@ -1555,7 +1555,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
- (void)keyBackupBannerCellDidTapCloseAction:(KeyBackupBannerCell * _Nonnull)cell
{
[self hideKeyBackupBanner:self.keyBackupBanner];
[self hideKeyBackupBannerWithDisplay:self.secureKeyBackupBannerDisplay];
}
@end