Merge pull request #1493 from OneSignal/fix/deprecated_openurl

[3.x.x] Replace deprecated openURL method
OneSignal · Oct 7, 2024 · 4cc5ae7 · 4cc5ae7
2 parents cd6e9a9 + d2994ef
commit 4cc5ae7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     name: Build and Test using any available iPhone simulator
-    runs-on: macos-latest
+    runs-on: macos-latest-large
 
     steps:
       - name: Checkout OneSignal-iOS-SDK

diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m b/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m
@@ -544,7 +544,7 @@ + (void)displayWebView:(NSURL*)url {
                     [webVC showInApp];
                 } else {
                     // Keep dispatch_async. Without this the url can take an extra 2 to 10 secounds to open.
-                    [[UIApplication sharedApplication] openURL:url];
+                    [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
                 }
             });
         }];

diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalLocation.m b/iOS_SDK/OneSignalSDK/Source/OneSignalLocation.m
@@ -293,10 +293,7 @@ + (void)showLocationSettingsAlertController {
     [[OneSignalDialogController sharedInstance] presentDialogWithTitle:@"Location Not Available" withMessage:@"You have previously denied sharing your device location. Please go to settings to enable." withActions:@[@"Open Settings"] cancelTitle:@"Cancel" withActionCompletion:^(int tappedActionIndex) {
         if (tappedActionIndex > -1) {
             [OneSignal onesignalLog:ONE_S_LL_DEBUG message:@"CLLocationManage open settings option click"];
-            #pragma clang diagnostic push
-            #pragma clang diagnostic ignored "-Wdeprecated"
-            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
-            #pragma clang diagnostic pop
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
         }
         [OneSignalLocation sendAndClearLocationListener:false];
         return;