fix: Websites categories action causes crash. (#562)

Fixes ooni/probe#2744 ## Proposed Changes - Add extra controls for alert on iPad.
ooni · Jun 19, 2024 · e8472e6 · e8472e6
1 parent df1ea33
commit e8472e6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/ooniprobe/View/Settings/SettingsTableViewController.m b/ooniprobe/View/Settings/SettingsTableViewController.m
@@ -253,6 +253,14 @@ -(IBAction)selectLanguage:(id)sender{
                         position:CSToastPositionBottom];
         }]];
     }
+
+    // Check if the device is an iPad
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        alert.popoverPresentationController.sourceView = self.view;
+        alert.popoverPresentationController.sourceRect = CGRectMake(self.view.bounds.size.width, self.view.bounds.size.height, 1.0, 1.0);
+        alert.popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionUp;
+    }
+
     [self presentViewController:alert animated:YES completion:nil];
 }
 

diff --git a/ooniprobe/View/Settings/WebsiteCategoriesTableViewController.m b/ooniprobe/View/Settings/WebsiteCategoriesTableViewController.m
@@ -77,6 +77,13 @@ - (IBAction)showListActions:(id)sender {
         [SettingsUtility updateAllWebsiteCategories:false];
         [self.navigationController popViewControllerAnimated:YES];
     }]];
+
+    // Check if the device is an iPad
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        alert.popoverPresentationController.sourceView = self.view;
+        alert.popoverPresentationController.sourceRect = CGRectMake(self.view.bounds.size.width / 2.0, self.view.bounds.size.height / 2.0, 1.0, 1.0);
+    }
+
     [self presentViewController:alert animated:YES completion:nil];
 }