Skip to content

Commit 8bf9347

Browse files
jkasten2jkasten2
committed
Fixed iOS kOSSettingsKeyAutoPrompt setting from 2.1.2
1 parent d2a567d commit 8bf9347

File tree

12 files changed

+36
-34
lines changed

12 files changed

+36
-34
lines changed

‎Unity4.7OneSignalExample/Assets/OneSignal/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.2
1+
2.1.3

‎Unity4.7OneSignalExample/Assets/OneSignal/src/OneSignalWPWNS.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public class OneSignalWPWNS : OneSignalPlatform {
3636
public OneSignalWPWNS(string appId) {
3737
OneSignalSDK_WP_WNS.ExternalInitUnity.Init(appId, (message, inAdditionalData, isActive) => {
3838
if (OneSignal.builder != null && OneSignal.builder.notificationOpenedDelegate != null) {
39-
Dictionary<string, string> additionalData = null;
39+
Dictionary<string, object> additionalData = null;
4040
if (inAdditionalData != null)
41-
additionalData = inAdditionalData.ToDictionary(pair => pair.Key, pair => (string)pair.Value);
41+
additionalData = inAdditionalData.ToDictionary(pair => pair.Key, pair => (object)pair.Value);
4242

4343
OSNotificationOpenedResult result = new OSNotificationOpenedResult();
4444
result.action = new OSNotificationAction();

‎Unity4.7OneSignalExample/Assets/Plugins/iOS/OneSignalUnityRuntime.m‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ - (void) setOneSignalUnityDelegate:(id<UIApplicationDelegate>)delegate {
9595
}
9696

9797
- (BOOL)oneSignalApplication:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
98-
initOneSignalObject(launchOptions, nil, 1, true, true);
98+
initOneSignalObject(launchOptions, nil, 1, true, false, true);
9999

100100
if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)])
101101
return [self oneSignalApplication:application didFinishLaunchingWithOptions:launchOptions];
@@ -111,34 +111,35 @@ void processNotificationReceived(NSString* notificationString) {
111111
UnitySendMessage(unityListener, "onPushNotificationReceived", [notificationString UTF8String]);
112112
}
113113

114-
void initOneSignalObject(NSDictionary* launchOptions, const char* appId, int displayOption, BOOL inAppLaunchURL, BOOL autoPrompt) {
114+
void initOneSignalObject(NSDictionary* launchOptions, const char* appId, int displayOption, BOOL inAppLaunchURL, BOOL autoPrompt, BOOL fromColdStart) {
115115

116116
NSString* appIdStr = (appId ? [NSString stringWithUTF8String: appId] : nil);
117117

118118
[OneSignal setValue:@"unity" forKey:@"mSDKType"];
119119

120120
[OneSignal initWithLaunchOptions:launchOptions appId:appIdStr handleNotificationReceived:^(OSNotification* notification) {
121-
if (unityListener)
122-
processNotificationReceived([notification stringify]);
123-
}
124-
handleNotificationAction:^(OSNotificationOpenedResult* openResult) {
125-
actionNotification = openResult;
126-
if (unityListener)
127-
processNotificationOpened([openResult stringify]);
128-
} settings:@{kOSSettingsKeyAutoPrompt : @(autoPrompt), kOSSettingsKeyInFocusDisplayOption : @(displayOption), kOSSettingsKeyInAppLaunchURL : @(inAppLaunchURL)}];
121+
if (unityListener)
122+
processNotificationReceived([notification stringify]);
123+
}
124+
handleNotificationAction:^(OSNotificationOpenedResult* openResult) {
125+
actionNotification = openResult;
126+
if (unityListener)
127+
processNotificationOpened([openResult stringify]);
128+
} settings:@{kOSSettingsKeyAutoPrompt: @(autoPrompt),
129+
kOSSettingsKeyInFocusDisplayOption: @(displayOption),
130+
kOSSettingsKeyInAppLaunchURL: @(inAppLaunchURL),
131+
@"kOSSettingsKeyInOmitNoAppIdLogging": @(fromColdStart)}];
129132

130133
}
131134

132135
void _init(const char* listenerName, const char* appId, BOOL autoPrompt, BOOL inAppLaunchURL, int displayOption, int logLevel, int visualLogLevel) {
133-
134-
135136
[OneSignal setLogLevel:logLevel visualLevel: visualLogLevel];
136137

137138
unsigned long len = strlen(listenerName);
138139
unityListener = malloc(len + 1);
139140
strcpy(unityListener, listenerName);
140141

141-
initOneSignalObject(nil, appId, displayOption, inAppLaunchURL, autoPrompt);
142+
initOneSignalObject(nil, appId, displayOption, inAppLaunchURL, autoPrompt, false);
142143

143144
if (actionNotification)
144145
processNotificationOpened([actionNotification stringify]);

‎Unity4.7OneSignalExample/Assets/Plugins/iOS/libOneSignal.a‎

6.94 KB
Binary file not shown.

‎Unity4.7OneSignalSDK.unitypackage‎

3.34 KB
Binary file not shown.

‎Unity5OneSignalExample/Assets/OneSignal/Platforms/iOS/OneSignalUnityRuntime.m‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ - (void) setOneSignalUnityDelegate:(id<UIApplicationDelegate>)delegate {
9595
}
9696

9797
- (BOOL)oneSignalApplication:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
98-
initOneSignalObject(launchOptions, nil, 1, true, true);
98+
initOneSignalObject(launchOptions, nil, 1, true, false, true);
9999

100100
if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)])
101101
return [self oneSignalApplication:application didFinishLaunchingWithOptions:launchOptions];
@@ -111,34 +111,35 @@ void processNotificationReceived(NSString* notificationString) {
111111
UnitySendMessage(unityListener, "onPushNotificationReceived", [notificationString UTF8String]);
112112
}
113113

114-
void initOneSignalObject(NSDictionary* launchOptions, const char* appId, int displayOption, BOOL inAppLaunchURL, BOOL autoPrompt) {
114+
void initOneSignalObject(NSDictionary* launchOptions, const char* appId, int displayOption, BOOL inAppLaunchURL, BOOL autoPrompt, BOOL fromColdStart) {
115115

116116
NSString* appIdStr = (appId ? [NSString stringWithUTF8String: appId] : nil);
117117

118118
[OneSignal setValue:@"unity" forKey:@"mSDKType"];
119119

120120
[OneSignal initWithLaunchOptions:launchOptions appId:appIdStr handleNotificationReceived:^(OSNotification* notification) {
121-
if (unityListener)
122-
processNotificationReceived([notification stringify]);
123-
}
124-
handleNotificationAction:^(OSNotificationOpenedResult* openResult) {
125-
actionNotification = openResult;
126-
if (unityListener)
127-
processNotificationOpened([openResult stringify]);
128-
} settings:@{kOSSettingsKeyAutoPrompt : @(autoPrompt), kOSSettingsKeyInFocusDisplayOption : @(displayOption), kOSSettingsKeyInAppLaunchURL : @(inAppLaunchURL)}];
121+
if (unityListener)
122+
processNotificationReceived([notification stringify]);
123+
}
124+
handleNotificationAction:^(OSNotificationOpenedResult* openResult) {
125+
actionNotification = openResult;
126+
if (unityListener)
127+
processNotificationOpened([openResult stringify]);
128+
} settings:@{kOSSettingsKeyAutoPrompt: @(autoPrompt),
129+
kOSSettingsKeyInFocusDisplayOption: @(displayOption),
130+
kOSSettingsKeyInAppLaunchURL: @(inAppLaunchURL),
131+
@"kOSSettingsKeyInOmitNoAppIdLogging": @(fromColdStart)}];
129132

130133
}
131134

132135
void _init(const char* listenerName, const char* appId, BOOL autoPrompt, BOOL inAppLaunchURL, int displayOption, int logLevel, int visualLogLevel) {
133-
134-
135136
[OneSignal setLogLevel:logLevel visualLevel: visualLogLevel];
136137

137138
unsigned long len = strlen(listenerName);
138139
unityListener = malloc(len + 1);
139140
strcpy(unityListener, listenerName);
140141

141-
initOneSignalObject(nil, appId, displayOption, inAppLaunchURL, autoPrompt);
142+
initOneSignalObject(nil, appId, displayOption, inAppLaunchURL, autoPrompt, false);
142143

143144
if (actionNotification)
144145
processNotificationOpened([actionNotification stringify]);

‎Unity5OneSignalExample/Assets/OneSignal/Platforms/iOS/libOneSignal.a‎

6.94 KB
Binary file not shown.

‎Unity5OneSignalExample/Assets/OneSignal/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.2
1+
2.1.3

‎Unity5OneSignalExample/Library/ProjectSettings.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ PlayerSettings:
518518
metroCertificatePassword:
519519
metroCertificateSubject: OneSignal
520520
metroCertificateIssuer: OneSignal
521-
metroCertificateNotAfter: 80f6110b15e3d101
521+
metroCertificateNotAfter: 809d8e5add6ed301
522522
metroApplicationDescription: UnityGameThriveExample
523523
wsaImages: {}
524524
metroTileShortName:

‎Unity5OneSignalExample/ProjectSettings/GraphicsSettings.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ GraphicsSettings:
4343
useCascadedShadowMaps: 0
4444
m_TierSettings_Tier2:
4545
renderingPath: 1
46-
useCascadedShadowMaps: 0
46+
useCascadedShadowMaps: 1
4747
m_TierSettings_Tier3:
4848
renderingPath: 1
49-
useCascadedShadowMaps: 0
49+
useCascadedShadowMaps: 1
5050
m_DefaultRenderingPath: 1
5151
m_DefaultMobileRenderingPath: 1
5252
m_TierSettings: []

0 commit comments

Comments
 (0)