Skip to content

Commit 5aaefa2

Browse files
emawbyemawby
committed
removing alert that crashes appclip on open
1 parent 1baaa97 commit 5aaefa2

File tree

4 files changed

+45
-22
lines changed

4 files changed

+45
-22
lines changed

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<key>com.apple.developer.associated-domains</key>
88
<array>
99
<string>appclips:onesignal.com</string>
10+
<string>applinks:onesignal.com</string>
1011
</array>
1112
<key>com.apple.security.application-groups</key>
1213
<array>

‎iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.m‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5656

5757
id openNotificationHandler = ^(OSNotificationOpenedResult *result) {
5858
NSLog(@"OSNotificationOpenedResult: %@", result.action);
59-
60-
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Notifiation Opened In App Delegate" message:@"Notification Opened In App Delegate" delegate:self cancelButtonTitle:@"Delete" otherButtonTitles:@"Cancel", nil];
61-
[alert show];
6259
};
6360
id notificationReceiverBlock = ^(OSNotification *notif, OSNotificationDisplayResponse completion) {
6461
NSLog(@"Will Receive Notification - %@", notif.notificationId);
@@ -85,7 +82,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
8582
[OneSignal addSubscriptionObserver:self];
8683
[OneSignal addEmailSubscriptionObserver:self];
8784

88-
[OneSignal pauseInAppMessages:true];
85+
[OneSignal pauseInAppMessages:false];
8986

9087
[OneSignal setNotificationWillShowInForegroundHandler:notificationReceiverBlock];
9188
[OneSignal setNotificationOpenedHandler:openNotificationHandler];

‎iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/OneSignalDevAppClip.entitlements‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
<dict>
55
<key>aps-environment</key>
66
<string>development</string>
7+
<key>com.apple.developer.associated-domains</key>
8+
<array>
9+
<string>appclips:onesignal.com</string>
10+
<string>applinks:onesignal.com</string>
11+
</array>
712
<key>com.apple.developer.parent-application-identifiers</key>
813
<array>
914
<string>$(AppIdentifierPrefix)com.onesignal.example</string>

‎iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@
1717
9112E8901E724C320022A1CB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9112E88E1E724C320022A1CB /* Main.storyboard */; };
1818
9112E8921E724C320022A1CB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9112E8911E724C320022A1CB /* Assets.xcassets */; };
1919
9112E8951E724C320022A1CB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9112E8931E724C320022A1CB /* LaunchScreen.storyboard */; };
20-
9112E8A51E724ECC0022A1CB /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9112E8A31E724DCB0022A1CB /* libOneSignal.a */; };
2120
9112E8A71E724EE00022A1CB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9112E8A61E724EE00022A1CB /* SystemConfiguration.framework */; };
2221
9150E7761E73BEDD00C5D46A /* NotificationService.m in Sources */ = {isa = PBXBuildFile; fileRef = 9150E7751E73BEDD00C5D46A /* NotificationService.m */; };
2322
9150E77A1E73BEDD00C5D46A /* OneSignalNotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 9150E7721E73BEDC00C5D46A /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
2423
91B6EA041E83214A00B5CF01 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9112E8A61E724EE00022A1CB /* SystemConfiguration.framework */; };
2524
91B6EA061E83215000B5CF01 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91B6EA051E83215000B5CF01 /* UserNotifications.framework */; };
2625
91B6EA071E83215800B5CF01 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9150E7821E73BFB600C5D46A /* UIKit.framework */; };
27-
91B6EA081E8321B400B5CF01 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9112E8A31E724DCB0022A1CB /* libOneSignal.a */; };
2826
91B6EA0A1E834B1700B5CF01 /* sentImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 91B6EA091E834B1700B5CF01 /* sentImage.jpg */; };
2927
91B6EA0C1E834BD800B5CF01 /* sentImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 91B6EA091E834B1700B5CF01 /* sentImage.jpg */; };
3028
CACBAAB6218A7136000ACAA5 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACBAAB5218A7136000ACAA5 /* WebKit.framework */; };
3129
CACBAAB7218A713C000ACAA5 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACBAAB5218A7136000ACAA5 /* WebKit.framework */; };
30+
DE138BFE2523CFA300AB46A3 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE138BFD2523CFA300AB46A3 /* libOneSignal.a */; };
31+
DE138C002523CFA700AB46A3 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE138BFF2523CFA700AB46A3 /* libOneSignal.a */; };
32+
DE138C022523CFAD00AB46A3 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE138C012523CFAD00AB46A3 /* libOneSignal.a */; };
3233
DE68DA5B24C7695900FC95A8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA5A24C7695900FC95A8 /* AppDelegate.m */; };
3334
DE68DA5E24C7695900FC95A8 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA5D24C7695900FC95A8 /* SceneDelegate.m */; };
3435
DE68DA6124C7695900FC95A8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA6024C7695900FC95A8 /* ViewController.m */; };
@@ -37,7 +38,6 @@
3738
DE68DA6924C7695A00FC95A8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DE68DA6724C7695A00FC95A8 /* LaunchScreen.storyboard */; };
3839
DE68DA6C24C7695A00FC95A8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA6B24C7695A00FC95A8 /* main.m */; };
3940
DE68DA7024C7695A00FC95A8 /* OneSignalExampleClip.app in Embed App Clips */ = {isa = PBXBuildFile; fileRef = DE68DA5724C7695900FC95A8 /* OneSignalExampleClip.app */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
40-
DE68DA7624C769E300FC95A8 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE68DA7524C769E300FC95A8 /* libOneSignal.a */; };
4141
DE68DA7724C769F200FC95A8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03432CDB1EBD426A0071FC48 /* CoreLocation.framework */; };
4242
DE68DA7824C769F900FC95A8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9112E8A61E724EE00022A1CB /* SystemConfiguration.framework */; };
4343
DE68DA7924C76A0300FC95A8 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91B6EA051E83215000B5CF01 /* UserNotifications.framework */; };
@@ -112,6 +112,9 @@
112112
91B6EA051E83215000B5CF01 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
113113
91B6EA091E834B1700B5CF01 /* sentImage.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = sentImage.jpg; sourceTree = "<group>"; };
114114
CACBAAB5218A7136000ACAA5 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
115+
DE138BFD2523CFA300AB46A3 /* libOneSignal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libOneSignal.a; sourceTree = BUILT_PRODUCTS_DIR; };
116+
DE138BFF2523CFA700AB46A3 /* libOneSignal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libOneSignal.a; sourceTree = BUILT_PRODUCTS_DIR; };
117+
DE138C012523CFAD00AB46A3 /* libOneSignal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libOneSignal.a; sourceTree = BUILT_PRODUCTS_DIR; };
115118
DE68DA5724C7695900FC95A8 /* OneSignalExampleClip.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OneSignalExampleClip.app; sourceTree = BUILT_PRODUCTS_DIR; };
116119
DE68DA5924C7695900FC95A8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
117120
DE68DA5A24C7695900FC95A8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -134,8 +137,8 @@
134137
buildActionMask = 2147483647;
135138
files = (
136139
CACBAAB6218A7136000ACAA5 /* WebKit.framework in Frameworks */,
137-
9112E8A51E724ECC0022A1CB /* libOneSignal.a in Frameworks */,
138140
03432CDC1EBD426A0071FC48 /* CoreLocation.framework in Frameworks */,
141+
DE138BFE2523CFA300AB46A3 /* libOneSignal.a in Frameworks */,
139142
9112E8A71E724EE00022A1CB /* SystemConfiguration.framework in Frameworks */,
140143
4529DECC1FA7EAB800CEAB1D /* UserNotifications.framework in Frameworks */,
141144
);
@@ -146,8 +149,8 @@
146149
buildActionMask = 2147483647;
147150
files = (
148151
CACBAAB7218A713C000ACAA5 /* WebKit.framework in Frameworks */,
149-
91B6EA081E8321B400B5CF01 /* libOneSignal.a in Frameworks */,
150152
91B6EA071E83215800B5CF01 /* UIKit.framework in Frameworks */,
153+
DE138C002523CFA700AB46A3 /* libOneSignal.a in Frameworks */,
151154
91B6EA061E83215000B5CF01 /* UserNotifications.framework in Frameworks */,
152155
91B6EA041E83214A00B5CF01 /* SystemConfiguration.framework in Frameworks */,
153156
);
@@ -159,9 +162,9 @@
159162
files = (
160163
DE68DA7A24C76A1800FC95A8 /* WebKit.framework in Frameworks */,
161164
DE68DA7924C76A0300FC95A8 /* UserNotifications.framework in Frameworks */,
165+
DE138C022523CFAD00AB46A3 /* libOneSignal.a in Frameworks */,
162166
DE68DA7724C769F200FC95A8 /* CoreLocation.framework in Frameworks */,
163167
DE68DA7824C769F900FC95A8 /* SystemConfiguration.framework in Frameworks */,
164-
DE68DA7624C769E300FC95A8 /* libOneSignal.a in Frameworks */,
165168
);
166169
runOnlyForDeploymentPostprocessing = 0;
167170
};
@@ -219,6 +222,9 @@
219222
9112E8A21E724DCA0022A1CB /* Frameworks */ = {
220223
isa = PBXGroup;
221224
children = (
225+
DE138C012523CFAD00AB46A3 /* libOneSignal.a */,
226+
DE138BFF2523CFA700AB46A3 /* libOneSignal.a */,
227+
DE138BFD2523CFA300AB46A3 /* libOneSignal.a */,
222228
DE68DA7524C769E300FC95A8 /* libOneSignal.a */,
223229
CACBAAB5218A7136000ACAA5 /* WebKit.framework */,
224230
03432CDB1EBD426A0071FC48 /* CoreLocation.framework */,
@@ -281,6 +287,8 @@
281287
DE68DA6F24C7695A00FC95A8 /* PBXTargetDependency */,
282288
);
283289
name = OneSignalExample;
290+
packageProductDependencies = (
291+
);
284292
productName = OneSignalDevApp;
285293
productReference = 9112E8821E724C320022A1CB /* OneSignalExample.app */;
286294
productType = "com.apple.product-type.application";
@@ -298,6 +306,8 @@
298306
dependencies = (
299307
);
300308
name = OneSignalNotificationServiceExtension;
309+
packageProductDependencies = (
310+
);
301311
productName = OneSignalNotificationServiceExtension;
302312
productReference = 9150E7721E73BEDC00C5D46A /* OneSignalNotificationServiceExtension.appex */;
303313
productType = "com.apple.product-type.app-extension";
@@ -315,6 +325,8 @@
315325
dependencies = (
316326
);
317327
name = OneSignalExampleClip;
328+
packageProductDependencies = (
329+
);
318330
productName = OneSignalDevAppClip;
319331
productReference = DE68DA5724C7695900FC95A8 /* OneSignalExampleClip.app */;
320332
productType = "com.apple.product-type.application.on-demand-install-capable";
@@ -369,6 +381,8 @@
369381
Base,
370382
);
371383
mainGroup = 9112E8791E724C320022A1CB;
384+
packageReferences = (
385+
);
372386
productRefGroup = 9112E8831E724C320022A1CB /* Products */;
373387
projectDirPath = "";
374388
projectRoot = "";
@@ -592,7 +606,7 @@
592606
buildSettings = {
593607
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
594608
CODE_SIGN_ENTITLEMENTS = OneSignalDevApp/OneSignalDevApp.entitlements;
595-
CURRENT_PROJECT_VERSION = 1.3;
609+
CURRENT_PROJECT_VERSION = 1.4.1;
596610
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
597611
DEVELOPMENT_TEAM = 99SW8E36CT;
598612
FRAMEWORK_SEARCH_PATHS = (
@@ -605,7 +619,7 @@
605619
"$(inherited)",
606620
"@executable_path/Frameworks",
607621
);
608-
MARKETING_VERSION = 1.3;
622+
MARKETING_VERSION = 1.4.1;
609623
OTHER_LDFLAGS = "-ObjC";
610624
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
611625
PRODUCT_NAME = OneSignalExample;
@@ -618,7 +632,7 @@
618632
buildSettings = {
619633
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
620634
CODE_SIGN_ENTITLEMENTS = OneSignalDevApp/OneSignalDevApp.entitlements;
621-
CURRENT_PROJECT_VERSION = 1.3;
635+
CURRENT_PROJECT_VERSION = 1.4.1;
622636
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
623637
DEVELOPMENT_TEAM = 99SW8E36CT;
624638
FRAMEWORK_SEARCH_PATHS = (
@@ -631,7 +645,7 @@
631645
"$(inherited)",
632646
"@executable_path/Frameworks",
633647
);
634-
MARKETING_VERSION = 1.3;
648+
MARKETING_VERSION = 1.4.1;
635649
OTHER_LDFLAGS = "-ObjC";
636650
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
637651
PRODUCT_NAME = OneSignalExample;
@@ -643,7 +657,7 @@
643657
isa = XCBuildConfiguration;
644658
buildSettings = {
645659
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
646-
CURRENT_PROJECT_VERSION = 1.3;
660+
CURRENT_PROJECT_VERSION = 1.4.1;
647661
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
648662
DEVELOPMENT_TEAM = 99SW8E36CT;
649663
FRAMEWORK_SEARCH_PATHS = (
@@ -656,7 +670,7 @@
656670
"@executable_path/Frameworks",
657671
"@executable_path/../../Frameworks",
658672
);
659-
MARKETING_VERSION = 1.3;
673+
MARKETING_VERSION = 1.4.1;
660674
OTHER_LDFLAGS = "-ObjC";
661675
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
662676
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -669,7 +683,7 @@
669683
isa = XCBuildConfiguration;
670684
buildSettings = {
671685
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
672-
CURRENT_PROJECT_VERSION = 1.3;
686+
CURRENT_PROJECT_VERSION = 1.4.1;
673687
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
674688
DEVELOPMENT_TEAM = 99SW8E36CT;
675689
FRAMEWORK_SEARCH_PATHS = (
@@ -683,7 +697,7 @@
683697
"@executable_path/Frameworks",
684698
"@executable_path/../../Frameworks",
685699
);
686-
MARKETING_VERSION = 1.3;
700+
MARKETING_VERSION = 1.4.1;
687701
OTHER_LDFLAGS = "-ObjC";
688702
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
689703
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -712,16 +726,21 @@
712726
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
713727
CODE_SIGN_ENTITLEMENTS = OneSignalDevAppClip/OneSignalDevAppClip.entitlements;
714728
CODE_SIGN_STYLE = Automatic;
715-
CURRENT_PROJECT_VERSION = 1.3;
729+
CURRENT_PROJECT_VERSION = 1.4.1;
716730
DEVELOPMENT_TEAM = 99SW8E36CT;
717731
GCC_C_LANGUAGE_STANDARD = gnu11;
732+
GCC_PREPROCESSOR_DEFINITIONS = (
733+
"DEBUG=1",
734+
"$(inherited)",
735+
OS_APP_CLIP,
736+
);
718737
INFOPLIST_FILE = OneSignalDevAppClip/Info.plist;
719738
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
720739
LD_RUNPATH_SEARCH_PATHS = (
721740
"$(inherited)",
722741
"@executable_path/Frameworks",
723742
);
724-
MARKETING_VERSION = 1.3;
743+
MARKETING_VERSION = 1.4.1;
725744
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
726745
MTL_FAST_MATH = YES;
727746
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip;
@@ -750,16 +769,17 @@
750769
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
751770
CODE_SIGN_ENTITLEMENTS = OneSignalDevAppClip/OneSignalDevAppClip.entitlements;
752771
CODE_SIGN_STYLE = Automatic;
753-
CURRENT_PROJECT_VERSION = 1.3;
772+
CURRENT_PROJECT_VERSION = 1.4.1;
754773
DEVELOPMENT_TEAM = 99SW8E36CT;
755774
GCC_C_LANGUAGE_STANDARD = gnu11;
775+
GCC_PREPROCESSOR_DEFINITIONS = OS_APP_CLIP;
756776
INFOPLIST_FILE = OneSignalDevAppClip/Info.plist;
757777
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
758778
LD_RUNPATH_SEARCH_PATHS = (
759779
"$(inherited)",
760780
"@executable_path/Frameworks",
761781
);
762-
MARKETING_VERSION = 1.3;
782+
MARKETING_VERSION = 1.4.1;
763783
MTL_FAST_MATH = YES;
764784
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip;
765785
PRODUCT_NAME = OneSignalExampleClip;

0 commit comments

Comments
 (0)