Skip to content

Commit b8383ab

Browse files
emawbyemawby
committed
adding location usage descriptions to app clip and update app id
1 parent 9acbb2b commit b8383ab

File tree

7 files changed

+76
-74
lines changed

7 files changed

+76
-74
lines changed

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
11
{
22
"images" : [
33
{
4-
"size" : "20x20",
5-
"idiom" : "iphone",
64
"filename" : "[email protected]",
7-
"scale" : "2x"
5+
"idiom" : "iphone",
6+
"scale" : "2x",
7+
"size" : "20x20"
88
},
99
{
10-
"size" : "20x20",
11-
"idiom" : "iphone",
1210
"filename" : "[email protected]",
13-
"scale" : "3x"
11+
"idiom" : "iphone",
12+
"scale" : "3x",
13+
"size" : "20x20"
1414
},
1515
{
16-
"size" : "29x29",
17-
"idiom" : "iphone",
1816
"filename" : "[email protected]",
19-
"scale" : "2x"
17+
"idiom" : "iphone",
18+
"scale" : "2x",
19+
"size" : "29x29"
2020
},
2121
{
22-
"size" : "29x29",
23-
"idiom" : "iphone",
2422
"filename" : "[email protected]",
25-
"scale" : "3x"
23+
"idiom" : "iphone",
24+
"scale" : "3x",
25+
"size" : "29x29"
2626
},
2727
{
28-
"size" : "40x40",
29-
"idiom" : "iphone",
3028
"filename" : "[email protected]",
31-
"scale" : "2x"
29+
"idiom" : "iphone",
30+
"scale" : "2x",
31+
"size" : "40x40"
3232
},
3333
{
34-
"size" : "40x40",
35-
"idiom" : "iphone",
3634
"filename" : "[email protected]",
37-
"scale" : "3x"
35+
"idiom" : "iphone",
36+
"scale" : "3x",
37+
"size" : "40x40"
3838
},
3939
{
40-
"size" : "60x60",
41-
"idiom" : "iphone",
4240
"filename" : "[email protected]",
43-
"scale" : "2x"
41+
"idiom" : "iphone",
42+
"scale" : "2x",
43+
"size" : "60x60"
4444
},
4545
{
46-
"size" : "60x60",
47-
"idiom" : "iphone",
4846
"filename" : "[email protected]",
49-
"scale" : "3x"
47+
"idiom" : "iphone",
48+
"scale" : "3x",
49+
"size" : "60x60"
5050
},
5151
{
52-
"size" : "20x20",
53-
"idiom" : "ipad",
5452
"filename" : "[email protected]",
55-
"scale" : "1x"
53+
"idiom" : "ipad",
54+
"scale" : "1x",
55+
"size" : "20x20"
5656
},
5757
{
58-
"size" : "20x20",
59-
"idiom" : "ipad",
6058
"filename" : "[email protected]",
61-
"scale" : "2x"
59+
"idiom" : "ipad",
60+
"scale" : "2x",
61+
"size" : "20x20"
6262
},
6363
{
64-
"size" : "29x29",
65-
"idiom" : "ipad",
6664
"filename" : "[email protected]",
67-
"scale" : "1x"
65+
"idiom" : "ipad",
66+
"scale" : "1x",
67+
"size" : "29x29"
6868
},
6969
{
70-
"size" : "29x29",
71-
"idiom" : "ipad",
7270
"filename" : "[email protected]",
73-
"scale" : "2x"
71+
"idiom" : "ipad",
72+
"scale" : "2x",
73+
"size" : "29x29"
7474
},
7575
{
76-
"size" : "40x40",
77-
"idiom" : "ipad",
7876
"filename" : "[email protected]",
79-
"scale" : "1x"
77+
"idiom" : "ipad",
78+
"scale" : "1x",
79+
"size" : "40x40"
8080
},
8181
{
82-
"size" : "40x40",
83-
"idiom" : "ipad",
8482
"filename" : "[email protected]",
85-
"scale" : "2x"
83+
"idiom" : "ipad",
84+
"scale" : "2x",
85+
"size" : "40x40"
8686
},
8787
{
88-
"size" : "76x76",
89-
"idiom" : "ipad",
9088
"filename" : "[email protected]",
91-
"scale" : "1x"
89+
"idiom" : "ipad",
90+
"scale" : "1x",
91+
"size" : "76x76"
9292
},
9393
{
94-
"size" : "76x76",
95-
"idiom" : "ipad",
9694
"filename" : "[email protected]",
97-
"scale" : "2x"
95+
"idiom" : "ipad",
96+
"scale" : "2x",
97+
"size" : "76x76"
9898
},
9999
{
100-
"size" : "83.5x83.5",
101-
"idiom" : "ipad",
102100
"filename" : "[email protected]",
103-
"scale" : "2x"
101+
"idiom" : "ipad",
102+
"scale" : "2x",
103+
"size" : "83.5x83.5"
104104
},
105105
{
106-
"size" : "1024x1024",
107-
"idiom" : "ios-marketing",
108106
"filename" : "onesignal1024.png",
109-
"scale" : "1x"
107+
"idiom" : "ios-marketing",
108+
"scale" : "1x",
109+
"size" : "1024x1024"
110110
}
111111
],
112112
"info" : {
113-
"version" : 1,
114-
"author" : "xcode"
113+
"author" : "xcode",
114+
"version" : 1
115115
}
116-
}
116+
}

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<key>NSAllowsArbitraryLoads</key>
2626
<true/>
2727
</dict>
28+
<key>NSLocationAlwaysUsageDescription</key>
29+
<string>Test Location</string>
2830
<key>NSLocationUsageDescription</key>
2931
<string>Test Location</string>
3032
<key>NSLocationWhenInUseUsageDescription</key>

‎iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
8282
return YES;
8383
}
8484

85-
#define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"ONESIGNAL_APP_ID_KEY_FOR_TESTING"
85+
#define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"8e04addd-be31-43dc-8c7a-0618eb781972"
8686

8787
+ (NSString*)getOneSignalAppId {
8888
NSString* onesignalAppId = [[NSUserDefaults standardUserDefaults] objectForKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING];
8989
if (!onesignalAppId)
90-
onesignalAppId = @"0ba9731b-33bd-43f4-8b59-61172e27447d";
90+
onesignalAppId = @"8e04addd-be31-43dc-8c7a-0618eb781972";
9191

9292
return onesignalAppId;
9393
}

‎iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/Info.plist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<key>NSAppClipRequestLocationConfirmation</key>
3030
<true/>
3131
</dict>
32+
<key>NSLocationUsageDescription</key>
33+
<string>Test usage description</string>
34+
<key>NSLocationWhenInUseUsageDescription</key>
35+
<string>when in usage description</string>
3236
<key>UIApplicationSceneManifest</key>
3337
<dict>
3438
<key>UIApplicationSupportsMultipleScenes</key>

‎iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/OneSignalDevAppClip.entitlements‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
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-
</array>
117
<key>com.apple.developer.parent-application-identifiers</key>
128
<array>
139
<string>$(AppIdentifierPrefix)com.onesignal.example</string>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@
592592
buildSettings = {
593593
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
594594
CODE_SIGN_ENTITLEMENTS = OneSignalDevApp/OneSignalDevApp.entitlements;
595-
CURRENT_PROJECT_VERSION = 1.1;
595+
CURRENT_PROJECT_VERSION = 1.3;
596596
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
597597
DEVELOPMENT_TEAM = 99SW8E36CT;
598598
FRAMEWORK_SEARCH_PATHS = (
@@ -614,7 +614,7 @@
614614
buildSettings = {
615615
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
616616
CODE_SIGN_ENTITLEMENTS = OneSignalDevApp/OneSignalDevApp.entitlements;
617-
CURRENT_PROJECT_VERSION = 1.1;
617+
CURRENT_PROJECT_VERSION = 1.3;
618618
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
619619
DEVELOPMENT_TEAM = 99SW8E36CT;
620620
FRAMEWORK_SEARCH_PATHS = (
@@ -635,7 +635,7 @@
635635
isa = XCBuildConfiguration;
636636
buildSettings = {
637637
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
638-
CURRENT_PROJECT_VERSION = 1.1;
638+
CURRENT_PROJECT_VERSION = 1.3;
639639
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
640640
DEVELOPMENT_TEAM = 99SW8E36CT;
641641
FRAMEWORK_SEARCH_PATHS = (
@@ -648,7 +648,7 @@
648648
"@executable_path/Frameworks",
649649
"@executable_path/../../Frameworks",
650650
);
651-
MARKETING_VERSION = 1.1;
651+
MARKETING_VERSION = 1.3;
652652
OTHER_LDFLAGS = "-ObjC";
653653
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
654654
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -661,7 +661,7 @@
661661
isa = XCBuildConfiguration;
662662
buildSettings = {
663663
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
664-
CURRENT_PROJECT_VERSION = 1.1;
664+
CURRENT_PROJECT_VERSION = 1.3;
665665
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
666666
DEVELOPMENT_TEAM = 99SW8E36CT;
667667
FRAMEWORK_SEARCH_PATHS = (
@@ -675,7 +675,7 @@
675675
"@executable_path/Frameworks",
676676
"@executable_path/../../Frameworks",
677677
);
678-
MARKETING_VERSION = 1.1;
678+
MARKETING_VERSION = 1.3;
679679
OTHER_LDFLAGS = "-ObjC";
680680
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
681681
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -704,7 +704,7 @@
704704
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
705705
CODE_SIGN_ENTITLEMENTS = OneSignalDevAppClip/OneSignalDevAppClip.entitlements;
706706
CODE_SIGN_STYLE = Automatic;
707-
CURRENT_PROJECT_VERSION = 1.1;
707+
CURRENT_PROJECT_VERSION = 1.3;
708708
DEVELOPMENT_TEAM = 99SW8E36CT;
709709
GCC_C_LANGUAGE_STANDARD = gnu11;
710710
INFOPLIST_FILE = OneSignalDevAppClip/Info.plist;
@@ -713,7 +713,7 @@
713713
"$(inherited)",
714714
"@executable_path/Frameworks",
715715
);
716-
MARKETING_VERSION = 1.1;
716+
MARKETING_VERSION = 1.3;
717717
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
718718
MTL_FAST_MATH = YES;
719719
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip;
@@ -742,7 +742,7 @@
742742
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
743743
CODE_SIGN_ENTITLEMENTS = OneSignalDevAppClip/OneSignalDevAppClip.entitlements;
744744
CODE_SIGN_STYLE = Automatic;
745-
CURRENT_PROJECT_VERSION = 1.1;
745+
CURRENT_PROJECT_VERSION = 1.3;
746746
DEVELOPMENT_TEAM = 99SW8E36CT;
747747
GCC_C_LANGUAGE_STANDARD = gnu11;
748748
INFOPLIST_FILE = OneSignalDevAppClip/Info.plist;
@@ -751,7 +751,7 @@
751751
"$(inherited)",
752752
"@executable_path/Frameworks",
753753
);
754-
MARKETING_VERSION = 1.1;
754+
MARKETING_VERSION = 1.3;
755755
MTL_FAST_MATH = YES;
756756
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip;
757757
PRODUCT_NAME = OneSignalExampleClip;

‎iOS_SDK/OneSignalSDK/Source/OneSignalLocation.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ + (void)internalGetLocation:(bool)prompt fallbackToSettings:(BOOL)fallback {
231231
[self sendCurrentAuthStatusToListeners];
232232
locationManager = [[clLocationManagerClass alloc] init];
233233
[locationManager setValue:[self sharedInstance] forKey:@"delegate"];
234-
234+
235235

236236
//Check info plist for request descriptions
237237
//LocationAlways > LocationWhenInUse > No entry (Log error)

0 commit comments

Comments
 (0)