fixup! Fixed getOneSignalAppId logic to get user defined

jkasten2 · jkasten2 · commit 7a952bf3f12f · 2021-08-06T14:33:05.000-07:00
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
@@ -95,14 +95,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     return YES;
 }
 
+#define ONESIGNAL_APP_ID_DEFAULT @"0ba9731b-33bd-43f4-8b59-61172e27447d"
 #define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"ONESIGNAL_APP_ID_KEY_FOR_TESTING"
 
 + (NSString*)getOneSignalAppId {
     NSString* userDefinedAppId = [[NSUserDefaults standardUserDefaults] objectForKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING];
     if (userDefinedAppId) {
         return userDefinedAppId;
     }
-    return @"1688d8f2-da7f-4815-8ee3-9d13788482c8";
+    return ONESIGNAL_APP_ID_DEFAULT;
 }
 
 + (void) setOneSignalAppId:(NSString*)onesignalAppId {
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.m b/iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.m
@@ -91,14 +91,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     return YES;
 }
 
+#define ONESIGNAL_APP_ID_DEFAULT @"0ba9731b-33bd-43f4-8b59-61172e27447d"
 #define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"ONESIGNAL_APP_ID_KEY_FOR_TESTING"
 
 + (NSString*)getOneSignalAppId {
     NSString* userDefinedAppId = [[NSUserDefaults standardUserDefaults] objectForKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING];
     if (userDefinedAppId) {
         return userDefinedAppId;
     }
-    return @"1688d8f2-da7f-4815-8ee3-9d13788482c8";
+    return ONESIGNAL_APP_ID_DEFAULT;
 }
 
 + (void) setOneSignalAppId:(NSString*)onesignalAppId {

Original file line number	Diff line number	Diff line change
`@@ -95,14 +95,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(`
`95`	`95`	`return YES;`
`96`	`96`	`}`
`97`	`97`
	`98`	`+#define ONESIGNAL_APP_ID_DEFAULT @"0ba9731b-33bd-43f4-8b59-61172e27447d"`
`98`	`99`	`#define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"ONESIGNAL_APP_ID_KEY_FOR_TESTING"`
`99`	`100`
`100`	`101`	`+ (NSString*)getOneSignalAppId {`
`101`	`102`	`NSString* userDefinedAppId = [[NSUserDefaults standardUserDefaults] objectForKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING];`
`102`	`103`	`if (userDefinedAppId) {`
`103`	`104`	`return userDefinedAppId;`
`104`	`105`	`}`
`105`		`- return @"1688d8f2-da7f-4815-8ee3-9d13788482c8";`
	`106`	`+ return ONESIGNAL_APP_ID_DEFAULT;`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`+ (void) setOneSignalAppId:(NSString*)onesignalAppId {`
Original file line number	Diff line number	Diff line change
`@@ -91,14 +91,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(`
`91`	`91`	`return YES;`
`92`	`92`	`}`
`93`	`93`
	`94`	`+#define ONESIGNAL_APP_ID_DEFAULT @"0ba9731b-33bd-43f4-8b59-61172e27447d"`
`94`	`95`	`#define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"ONESIGNAL_APP_ID_KEY_FOR_TESTING"`
`95`	`96`
`96`	`97`	`+ (NSString*)getOneSignalAppId {`
`97`	`98`	`NSString* userDefinedAppId = [[NSUserDefaults standardUserDefaults] objectForKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING];`
`98`	`99`	`if (userDefinedAppId) {`
`99`	`100`	`return userDefinedAppId;`
`100`	`101`	`}`
`101`		`- return @"1688d8f2-da7f-4815-8ee3-9d13788482c8";`
	`102`	`+ return ONESIGNAL_APP_ID_DEFAULT;`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`+ (void) setOneSignalAppId:(NSString*)onesignalAppId {`