Merge pull request #1387 from nextcloud/fix-message-expiration-popover

Fix position of message expiration selector on iPads
nextcloud · Oct 17, 2023 · 3040971 · 3040971
2 parents d43dc7d + b53707c
commit 3040971
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/NextcloudTalk/RoomInfoTableViewController.m b/NextcloudTalk/RoomInfoTableViewController.m
@@ -433,6 +433,17 @@ - (NSArray *)getConversationActions
     return [NSArray arrayWithArray:actions];
 }
 
+- (NSIndexPath *)getIndexPathForConversationAction:(ConversationAction)action
+{
+    NSInteger section = [self getSectionForRoomInfoSection:kRoomInfoSectionConversation];
+    NSIndexPath *actionIndexPath = [NSIndexPath indexPathForRow:0 inSection:section];
+    NSInteger actionRow = [[self getConversationActions] indexOfObject:[NSNumber numberWithInt:action]];
+    if(NSNotFound != actionRow) {
+        actionIndexPath = [NSIndexPath indexPathForRow:actionRow inSection:section];
+    }
+    return actionIndexPath;
+}
+
 - (NSArray *)getWebinarActions
 {
     NSMutableArray *actions = [[NSMutableArray alloc] init];
@@ -688,8 +699,8 @@ - (void)presentMessageExpirationSelector
 
     // Presentation on iPads
     optionsActionSheet.popoverPresentationController.sourceView = self.tableView;
-    optionsActionSheet.popoverPresentationController.sourceRect = [self.tableView rectForRowAtIndexPath:[self getIndexPathForNotificationAction:kNotificationActionChatNotifications]];
-    
+    optionsActionSheet.popoverPresentationController.sourceRect = [self.tableView rectForRowAtIndexPath:[self getIndexPathForConversationAction:kConversationActionMessageExpiration]];
+
     [self presentViewController:optionsActionSheet animated:YES completion:nil];
 }