Fixed conflict with APP_ID

Author: jkasten2

iOS_SDK/OneSignalSDK/Source/OSReceiveReceiptController.m

@@ -45,7 +45,7 @@ - (void)sendReceiveReceiptCachedWithNotification:(NSString *)notificationId {
     NSUserDefaults *userDefaultsShared = [OneSignalSharedUserDefaults getSharedUserDefault];
     let currentSubscriptionState = [[OSSubscriptionState alloc] initAsFrom];
     let playerId = [currentSubscriptionState userId];
-    let appId = [userDefaultsShared stringForKey:APP_ID];
+    let appId = [userDefaultsShared stringForKey:NSUD_APP_ID];
 
     [self sendReceiveReceiptWithPlayerId:playerId notificationId:notificationId appId:appId];
 }

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -604,15 +604,15 @@ +(bool)initAppId:(NSString*)appId withUserDefaults:(NSUserDefaults*)userDefaults
     }
 
     if (!app_id) {
-        app_id  = [userDefaults stringForKey:APP_ID];
+        app_id  = [userDefaults stringForKey:NSUD_APP_ID];
         if (![settings[kOSSettingsKeyInOmitNoAppIdLogging] boolValue])
             onesignal_Log(ONE_S_LL_FATAL, @"OneSignal AppId never set!");
         else
             return true;
-    } else if (![app_id isEqualToString:[userDefaults stringForKey:APP_ID]]) {
+    } else if (![app_id isEqualToString:[userDefaults stringForKey:NSUD_APP_ID]]) {
         // Handle changes to the app id. This might happen on a developer's device when testing
         // Will also run the first time OneSignal is initialized
-        [userDefaults setObject:app_id forKey:APP_ID];
+        [userDefaults setObject:app_id forKey:NSUD_APP_ID];
         [userDefaults setObject:nil forKey:USERID];
         [userDefaults synchronize];
     }

iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h

@@ -38,6 +38,7 @@
 #define EMAIL_AUTH_CODE @"GT_EMAIL_AUTH_CODE"
 #define SUBSCRIPTION_SETTING @"ONESIGNAL_SUBSCRIPTION_LAST"
 #define EMAIL_USERID @"GT_EMAIL_PLAYER_ID"
+#define NSUD_APP_ID @"GT_APP_ID"
 #define USERID @"GT_PLAYER_ID"
 #define USERID_LAST @"GT_PLAYER_ID_LAST"
 #define USER_LAST_CLOSED_TIME @"GT_LAST_CLOSED_TIME"
@@ -70,7 +71,6 @@
 #define CACHED_RECEIVED_NOTIFICATION_IDS @"CACHED_RECEIVED_NOTIFICATION_IDS"
 #define CACHED_UNATTRIBUTED_UNIQUE_OUTCOME_EVENTS_SENT @"CACHED_UNATTRIBUTED_UNIQUE_OUTCOME_EVENTS_SENT"
 #define CACHED_ATTRIBUTED_UNIQUE_OUTCOME_EVENT_NOTIFICATION_IDS_SENT @"CACHED_ATTRIBUTED_UNIQUE_OUTCOME_EVENT_NOTIFICATION_IDS_SENT"
-#define APP_ID @"GT_APP_ID"
 
 // To avoid undefined symbol compiler errors on older versions of Xcode,
 // instead of using UNAuthorizationOptionProvisional directly, we will use