iOS fixes for launch args

coronalabs · Mar 7, 2022 · 56260c2 · 56260c2
1 parent 19b35ea
commit 56260c2
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 8 deletions.
diff --git a/plugins/2020.3569/iphone-sim/libNotificationsV2Plugin.a b/plugins/2020.3569/iphone-sim/libNotificationsV2Plugin.a
diff --git a/plugins/2020.3569/iphone/libNotificationsV2Plugin.a b/plugins/2020.3569/iphone/libNotificationsV2Plugin.a
diff --git a/src/ios/Plugin/CoronaNotificationsDelegate.mm b/src/ios/Plugin/CoronaNotificationsDelegate.mm
@@ -16,9 +16,48 @@
 #if PLUGIN_FIREBASE
 #import <FirebaseMessaging/FirebaseMessaging.h>
 #endif
-
+static int
+SetLaunchArgs( UIApplication *application, NSDictionary *launchOptions, lua_State *L )
+{
+    int itemsPushed = 0;
+    UILocalNotification *localNotification = [launchOptions objectForKey:UIApplicationLaunchOptionsLocalNotificationKey];
+    if ( localNotification )
+    {
+        IPhoneLocalNotificationEvent e(
+                                       localNotification, IPhoneNotificationEvent::ToApplicationState( application.applicationState ) );
+        e.Push( L );
+        itemsPushed = 1;
+    }
+
+    NSDictionary *remoteNotification =
+        [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+
+    if ( remoteNotification )
+    {
+        IPhoneRemoteNotificationEvent e(
+                                        remoteNotification, IPhoneNotificationEvent::ToApplicationState( application.applicationState ) );
+        e.Push( L );
+        itemsPushed = 1;
+    }
+
+    return itemsPushed;
+}
 @implementation CoronaNotificationsDelegate
-
+- (int)execute:(id<CoronaRuntime>)runtime command:(NSString*)command param:(id)param
+{
+    lua_State *L = runtime.L;
+    int itemsPushed = 0;
+    if ( [command isEqualToString:@"pushLaunchArgKey"] )
+    {
+        lua_pushstring( L, "notification" );
+        itemsPushed = 1;
+    }
+    else if ( [command isEqualToString:@"pushLaunchArgValue" ] )
+    {
+        itemsPushed = SetLaunchArgs( [UIApplication sharedApplication], param, L);
+    }
+    return itemsPushed;
+}
 - (void)willLoadMain:(id<CoronaRuntime>)runtime
 {
     // NOP

diff --git a/src/ios/Plugin/NotificationsV2Plugin.mm b/src/ios/Plugin/NotificationsV2Plugin.mm
@@ -569,7 +569,8 @@ static bool isFirebaseLinked() {
 
     UILocalNotification *notification = IPhoneLocalNotificationEvent::CreateAndSchedule( L, 1 );
     int allowedNotificationTypes = UIUserNotificationTypeBadge | UIUserNotificationTypeSound | UIUserNotificationTypeAlert;
-    id settings = [UIUserNotificationSettings settingsForTypes:allowedNotificationTypes categories:nil];
+    Class cls = NSClassFromString(@"UIUserNotificationSettings");
+    id settings = [cls settingsForTypes:allowedNotificationTypes categories:nil];
     [[UIApplication sharedApplication] registerUserNotificationSettings:settings];
     [[UIApplication sharedApplication] scheduleLocalNotification:notification];
 

diff --git a/src/ios/build.sh b/src/ios/build.sh
@@ -43,11 +43,11 @@ echo "OUTPUT_DIR: $OUTPUT_DIR"
 checkError
 
 # iOS
-xcodebuild -project "$path/Plugin.xcodeproj" -configuration $CONFIG -sdk iphoneos -alltargets
+xcodebuild -project "$path/Plugin.xcodeproj" -configuration $CONFIG -sdk iphoneos -alltargets -UseModernBuildSystem=NO
 checkError
 
 # iOS-sim
-xcodebuild -project "$path/Plugin.xcodeproj" -configuration $CONFIG -sdk iphonesimulator -alltargets
+xcodebuild -project "$path/Plugin.xcodeproj" -configuration $CONFIG -sdk iphonesimulator -alltargets -UseModernBuildSystem=NO
 checkError
 
 # create universal binary
@@ -126,6 +126,3 @@ TARGET_NAME=NotificationsV2Plugin
 build_plugin_structure "$OUTPUT_DIR/BuiltPlugin/Regular/iphone" iphoneos  " -extract armv7 -extract  arm64 " EmbeddedFrameworks-none
 
 build_plugin_structure "$OUTPUT_DIR/BuiltPlugin/Regular/iphone-sim" iphonesimulator  " -extract i386  -extract  x86_64 " EmbeddedFrameworksSim-none
-
-
-