Merge branch 'develop' into 'feature/5203_us01_add_federation_room_overview'

# Conflicts:
#   Config/BWIBuildSettings.swift

Riot/Modules/Application/LegacyAppDelegate.m

@@ -270,13 +270,17 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     [[AppConfiguration new] setupSettings];
     
     MXLogConfiguration *configuration = [[MXLogConfiguration alloc] init];
+#if DEBUG
     configuration.logLevel = MXLogLevelVerbose;
-    configuration.logFilesSizeLimit = 100 * 1024 * 1024; // 100MB
-    configuration.maxLogFilesCount = 50;
+#else
+    configuration.logLevel = MXLogLevelNone;
+#endif
+    configuration.logFilesSizeLimit = 0; // 100MB
+    configuration.maxLogFilesCount = 0;
     
     // Redirect NSLogs to files only if we are not debugging
     if (!isatty(STDERR_FILENO)) {
-        configuration.redirectLogsToFiles = YES;
+        configuration.redirectLogsToFiles = NO;
     }
     
     [MXLog configure:configuration];

Riot/Modules/Common/Recents/RecentsViewController.m

@@ -2494,12 +2494,6 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
             MXStrongifyAndReturnIfNil(self);
             self->currentAlert = nil;
         }]];
-        
-        [errorAlert addAction:[UIAlertAction actionWithTitle:[BWIL10n bwiOutdatedVersionLogoutButton]
-                                                       style:UIAlertActionStyleDefault
-                                                     handler:^(UIAlertAction * action) {
-            [self logout];
-        }]];
 
         [self presentViewController:errorAlert animated:YES completion:nil];
     }

Riot/Modules/Contacts/Views/ContactTableViewCell.m

@@ -232,15 +232,25 @@
 - (void)refreshContactBadgeImage
 {
     NSString *matrixId = [self firstMatrixId];
-    if (matrixId)
+    // bwi: #5236 remove encryption status shield
+    if (BWIBuildSettings.shared.showEncryptionStatusBadgeOnAvatar)
     {
-        [self.mxRoom encryptionTrustLevelForUserId:matrixId onComplete:^(UserEncryptionTrustLevel userEncryptionTrustLevel) {
-            self.avatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:userEncryptionTrustLevel];
-        }];
+        if (matrixId)
+        {
+            [self.mxRoom encryptionTrustLevelForUserId:matrixId onComplete:^(UserEncryptionTrustLevel userEncryptionTrustLevel) {
+                self.avatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:userEncryptionTrustLevel];
+            }];
+        }
+        else
+        {
+            self.avatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:UserEncryptionTrustLevelUnknown];
+        }
+        self.avatarBadgeImageView.hidden = NO;
     }
-    else
+    else 
     {
-        self.avatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:UserEncryptionTrustLevelUnknown];
+        self.avatarBadgeImageView.image = nil;
+        self.avatarBadgeImageView.hidden = YES;
     }
 }
 

Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m

@@ -428,9 +428,17 @@
         {
             self.roomMemberStatusLabel.text = @"";
         }
-        
-        self.roomMemberAvatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:self.encryptionTrustLevel];
-        
+        // bwi: #5236 remove encryption status shield
+        if (BWIBuildSettings.shared.showEncryptionStatusBadgeOnAvatar)
+        {
+            self.roomMemberAvatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:self.encryptionTrustLevel];
+            self.roomMemberAvatarBadgeImageView.hidden = NO;
+        }
+        else
+        {
+            self.roomMemberAvatarBadgeImageView.image = nil;
+            self.roomMemberAvatarBadgeImageView.hidden = YES;
+        }
         // Retrieve the existing direct chats
         [directChatsArray removeAllObjects];
         NSArray *directRoomIds = self.mainSession.directRooms[self.mxRoomMember.userId];

Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift

@@ -34,7 +34,13 @@ final class RoomInfoListViewModel: NSObject, RoomInfoListViewModelType {
     weak var coordinatorDelegate: RoomInfoListViewModelCoordinatorDelegate?
     
     private var viewData: RoomInfoListViewData {
-        let encryptionImage = EncryptionTrustLevelBadgeImageHelper.roomBadgeImage(for: room.summary.roomEncryptionTrustLevel())
+        var encryptionImage: UIImage?
+        // bwi: #5236 remove encryption status shield
+        if BWIBuildSettings.shared.showEncryptionStatusBadgeOnAvatar {
+            encryptionImage = EncryptionTrustLevelBadgeImageHelper.roomBadgeImage(for: room.summary.roomEncryptionTrustLevel())
+        } else {
+            encryptionImage = nil
+        }
         let directUserPresence = session.user(withUserId: room.directUserId)?.presence ?? .unknown
         
         let basicInfoViewData = RoomInfoBasicViewData(avatarUrl: room.summary.avatar,

Riot/Modules/Room/RoomViewController.m

@@ -2238,8 +2238,8 @@ static CGSize kThreadListBarButtonItemImageSize;
 - (UIImage*)roomEncryptionBadgeImage
 {
     UIImage *encryptionIcon;
-    
-    if (self.isEncryptionEnabled)
+    // bwi: #5236 remove encryption status shield
+    if (self.isEncryptionEnabled && BWIBuildSettings.shared.showEncryptionStatusBadgeOnAvatar)
     {
         RoomEncryptionTrustLevel roomEncryptionTrustLevel = ((RoomDataSource*)self.roomDataSource).encryptionTrustLevel;