MESSENGER-2762 Initial Merge

Riot/Modules/Contacts/Views/ContactTableViewCell.m

@@ -1,6 +1,7 @@
 /*
  Copyright 2015 OpenMarket Ltd
  Copyright 2017 Vector Creations Ltd
+ Copyright (c) 2021 BWI GmbH
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -54,6 +55,7 @@
     // apply the vector colours
     self.contactDisplayNameLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     self.contactInformationLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
+    self.contactInformationLabel.hidden = BuildSettings.allowLocalContactPresence ? NO : YES;
     self.powerLevelLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
     
     // Clear the default background color of a MXKImageView instance
@@ -337,19 +339,8 @@
         presenceText =  [VectorL10n roomParticipantsOffline];
     }
     
-    if (presenceText.length)
-    {
-        self.contactInformationLabel.hidden = NO;
-    }
-    else
-    {
-        // Hide and fill the label with a fake string to harmonize the height of all the cells.
-        // This is a drawback of the self-sizing cell.
-        self.contactInformationLabel.hidden = YES;
-        presenceText = @"No presence";
-    }
-
     self.contactInformationLabel.text = presenceText;
+
 }
 
 #pragma mark - events