Skip to content

Bundle ID Improvement #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2018
Merged

Bundle ID Improvement #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

id notificationReceiverBlock = ^(OSNotification *notification) {
NSLog(@"Received Notification - %@", notification.payload.notificationID);

[[UIApplication sharedApplication] setApplicationIconBadgeNumber:11];
};

[OneSignal initWithLaunchOptions:launchOptions
Expand Down
10 changes: 4 additions & 6 deletions iOS_SDK/OneSignalDevApp/OneSignalDevApp/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>OneSignal_require_privacy_consent</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand Down Expand Up @@ -31,10 +29,8 @@
<string>Test Location</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Test Location2</string>
<key>OneSignal_app_groups_key</key>
<string> group.com.onesignal.example.testgroup </string>
<key>OneSignal_disable_badge_clearing</key>
<true/>
<key>OneSignal_require_privacy_consent</key>
<false/>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
Expand All @@ -47,6 +43,8 @@
<array>
<string>armv7</string>
</array>
<key>OneSignal_disable_badge_clearing</key>
<false/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
2 changes: 0 additions & 2 deletions iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>OneSignal_app_groups_key</key>
<string>group.com.onesignal.example.testgroup</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
Expand Down
13 changes: 12 additions & 1 deletion iOS_SDK/OneSignalSDK/Source/OneSignalExtensionBadgeHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,17 @@ + (NSInteger)currentCachedBadgeValue {
return [(NSNumber *)[userDefaults objectForKey:ONESIGNAL_BADGE_KEY] integerValue];
}

//gets the NSBundle of the primary application - NOT the app extension
//this way we can determine the bundle ID for the host (primary) application.
+ (NSString *)primaryBundleIdentifier {
NSBundle *bundle = [NSBundle mainBundle];
if ([[bundle.bundleURL pathExtension] isEqualToString:@"appex"])
bundle = [NSBundle bundleWithURL:[[bundle.bundleURL URLByDeletingLastPathComponent] URLByDeletingLastPathComponent]];

return [bundle bundleIdentifier];

}

+ (void)updateCachedBadgeValue:(NSInteger)value {
//since badge logic can be executed in an extension, we need to use app groups to get
//a shared NSUserDefaults from the app group suite name
Expand All @@ -77,7 +88,7 @@ + (NSString *)appGroupName {
var appGroupName = (NSString *)[[NSBundle mainBundle] objectForInfoDictionaryKey:ONESIGNAL_APP_GROUP_NAME_KEY];

if (!appGroupName)
appGroupName = [NSString stringWithFormat:@"group.%@.%@", [[NSBundle mainBundle] bundleIdentifier], @"onesignal"];
appGroupName = [NSString stringWithFormat:@"group.%@.%@", OneSignalExtensionBadgeHandler.primaryBundleIdentifier, @"onesignal"];

return [appGroupName stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
}
Expand Down