Fixing misc warnings

Author: emawby

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSJSONHandling.h

@@ -26,7 +26,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "OSNotification.h"
+#import <OneSignalCore/OSNotification.h>
 
 @protocol OSJSONDecodable
 + (instancetype _Nullable)instanceWithData:(NSData * _Nonnull)data;

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.h

@@ -26,7 +26,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "OneSignalRequest.h"
+#import <OneSignalCore/OneSignalRequest.h>
 
 #ifndef OneSignalRequests_h
 #define OneSignalRequests_h

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalClient.h

@@ -26,7 +26,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "OneSignalRequest.h"
+#import <OneSignalCore/OneSignalRequest.h>
 
 #ifndef OneSignalClient_h
 #define OneSignalClient_h

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalRequest.h

@@ -28,7 +28,7 @@
 #pragma clang diagnostic ignored "-Wnullability-completeness"
 
 #import <Foundation/Foundation.h>
-#import "OneSignalCommonDefines.h"
+#import <OneSignalCore/OneSignalCommonDefines.h>
 
 
 #ifndef OneSignalRequest_h

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSNotification+Internal.h

@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#import "OSNotificationClasses.h"
+#import <OneSignalCore/OSNotificationClasses.h>
 
 #ifndef OSNotification_Internal_h
 #define OSNotification_Internal_h

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSNotificationClasses.h

@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#import "OSNotification.h"
+#import <OneSignalCore/OSNotification.h>
 
 // Pass in nil means a notification will not display
 typedef void (^OSNotificationDisplayResponse)(OSNotification* _Nullable  notification);

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalTrackFirebaseAnalytics.h

@@ -26,7 +26,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "OSNotificationClasses.h"
+#import <OneSignalCore/OSNotificationClasses.h>
 
 @interface OneSignalTrackFirebaseAnalytics : NSObject
 +(BOOL)libraryExists;

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.h

@@ -55,11 +55,11 @@ typedef NS_ENUM(NSInteger, OSNotificationPermission) {
 @property (readonly, nonatomic) BOOL providesAppNotificationSettings;
 @property (readonly, nonatomic) OSNotificationPermission status;
 - (NSDictionary* _Nonnull)toDictionary;
-- (instancetype)initWithStatus:(OSNotificationPermission)status reachable:(BOOL)reachable hasPrompted:(BOOL)hasPrompted provisional:(BOOL)provisional providesAppNotificationSettings:(BOOL)providesAppNotificationSettings;
+- (instancetype _Nonnull )initWithStatus:(OSNotificationPermission)status reachable:(BOOL)reachable hasPrompted:(BOOL)hasPrompted provisional:(BOOL)provisional providesAppNotificationSettings:(BOOL)providesAppNotificationSettings;
 @end
 
 @protocol OSPermissionStateObserver<NSObject>
-- (void)onChanged:(OSPermissionState*)state;
+- (void)onChanged:(OSPermissionState * _Nonnull)state;
 @end
 
 typedef OSObservable<NSObject<OSPermissionStateObserver>*, OSPermissionState*> ObservablePermissionStateType;
@@ -80,15 +80,15 @@ typedef OSObservable<NSObject<OSPermissionStateObserver>*, OSPermissionState*> O
 @property (readonly, nonatomic) OSNotificationPermission status;
 @property int notificationTypes;
 
-@property (nonatomic) ObservablePermissionStateType* observable;
+@property (nonatomic) ObservablePermissionStateType * _Nonnull observable;
 
 - (void) persistAsFrom;
 
-- (instancetype)initAsTo;
-- (instancetype)initAsFrom;
+- (instancetype _Nonnull )initAsTo;
+- (instancetype _Nonnull )initAsFrom;
 
-- (BOOL)compare:(OSPermissionStateInternal*)from;
-- (OSPermissionState *)getExternalState;
+- (BOOL)compare:(OSPermissionStateInternal * _Nonnull)from;
+- (OSPermissionState * _Nonnull)getExternalState;
 
 @end
 
@@ -97,18 +97,18 @@ typedef OSObservable<NSObject<OSPermissionStateObserver>*, OSPermissionState*> O
 @property (readonly, nonnull) OSPermissionState* to;
 @property (readonly, nonnull) OSPermissionState* from;
 - (NSDictionary* _Nonnull)toDictionary;
-- (instancetype)initAsTo:(OSPermissionState *)to from:(OSPermissionState *)from;
+- (instancetype _Nonnull)initAsTo:(OSPermissionState * _Nonnull)to from:(OSPermissionState * _Nonnull)from;
 @end
 
 @protocol OSPermissionObserver <NSObject>
-- (void)onOSPermissionChanged:(OSPermissionStateChanges* _Nonnull)stateChanges;
+- (void)onOSPermissionChanged:(OSPermissionStateChanges * _Nonnull)stateChanges;
 @end
 
 typedef OSObservable<NSObject<OSPermissionObserver>*, OSPermissionStateChanges*> ObservablePermissionStateChangesType;
 
 
 @interface OSPermissionChangedInternalObserver : NSObject<OSPermissionStateObserver>
-+ (void)fireChangesObserver:(OSPermissionStateInternal*)state;
++ (void)fireChangesObserver:(OSPermissionStateInternal * _Nonnull)state;
 @end
 
 

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift

@@ -425,7 +425,7 @@ class OSRequestFetchUser: OneSignalRequest, OSUserRequest {
         self.identityModel = identityModel
         self.aliasLabel = aliasLabel
         self.aliasId = aliasId
-        self.stringDescription = "OSRequestFetchUser with aliasLabel: \(aliasLabel) aliasId: \(aliasId)"
+        self.stringDescription = "OSRequestFetchUser with aliasLabel: \(aliasLabel ?? "nil") aliasId: \(aliasId ?? "nil")"
         super.init()
         self.method = GET
         _ = prepareForExecution() // sets the path property
@@ -451,7 +451,7 @@ class OSRequestFetchUser: OneSignalRequest, OSUserRequest {
         self.identityModel = identityModel
         self.aliasLabel = coder.decodeObject(forKey: "aliasLabel") as? String
         self.aliasId = coder.decodeObject(forKey: "aliasId") as? String
-        self.stringDescription = "OSRequestFetchUser with aliasLabel: \(aliasLabel) aliasId: \(aliasId)"
+        self.stringDescription = "OSRequestFetchUser with aliasLabel: \(aliasLabel ?? "nil") aliasId: \(aliasId ?? "nil")"
         super.init()
         self.method = HTTPMethod(rawValue: rawMethod)
         self.timestamp = timestamp
@@ -597,7 +597,7 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
     init(properties: [String: Any], deltas: [String: Any]?, refreshDeviceMetadata: Bool?, modelToUpdate: OSPropertiesModel, identityModel: OSIdentityModel) {
         self.modelToUpdate = modelToUpdate
         self.identityModel = identityModel
-        self.stringDescription = "OSRequestUpdateProperties with properties: \(properties) deltas: \(deltas) refreshDeviceMetadata: \(refreshDeviceMetadata)"
+        self.stringDescription = "OSRequestUpdateProperties with properties: \(properties) deltas: \(String(describing:deltas)) refreshDeviceMetadata: \(String(describing:refreshDeviceMetadata))"
         super.init()
 
         var params: [String: Any] = [:]
@@ -668,7 +668,7 @@ class OSRequestCreateSubscription: OneSignalRequest, OSUserRequest {
     init(subscriptionModel: OSSubscriptionModel, identityModel: OSIdentityModel) {
         self.subscriptionModel = subscriptionModel
         self.identityModel = identityModel
-        self.stringDescription = "OSRequestCreateSubscription with subscriptionModel: \(subscriptionModel.address)"
+        self.stringDescription = "OSRequestCreateSubscription with subscriptionModel: \(subscriptionModel.address ?? "nil")"
         super.init()
 
         var subscriptionParams: [String: Any] = [:]
@@ -704,7 +704,7 @@ class OSRequestCreateSubscription: OneSignalRequest, OSUserRequest {
         }
         self.subscriptionModel = subscriptionModel
         self.identityModel = identityModel
-        self.stringDescription = "OSRequestCreateSubscription with subscriptionModel: \(subscriptionModel.address)"
+        self.stringDescription = "OSRequestCreateSubscription with subscriptionModel: \(subscriptionModel.address ?? "nil")"
         super.init()
         self.parameters = parameters
         self.method = HTTPMethod(rawValue: rawMethod)
@@ -902,7 +902,7 @@ class OSRequestDeleteSubscription: OneSignalRequest, OSUserRequest {
 
     init(subscriptionModel: OSSubscriptionModel) {
         self.subscriptionModel = subscriptionModel
-        self.stringDescription = "OSRequestDeleteSubscription with subscriptionModel: \(subscriptionModel.address)"
+        self.stringDescription = "OSRequestDeleteSubscription with subscriptionModel: \(subscriptionModel.address ?? "nil")"
         super.init()
         self.method = DELETE
         _ = prepareForExecution() // sets the path property
@@ -924,7 +924,7 @@ class OSRequestDeleteSubscription: OneSignalRequest, OSUserRequest {
             return nil
         }
         self.subscriptionModel =  subscriptionModel
-        self.stringDescription = "OSRequestDeleteSubscription with subscriptionModel: \(subscriptionModel.address)"
+        self.stringDescription = "OSRequestDeleteSubscription with subscriptionModel: \(subscriptionModel.address ?? "nil")"
         super.init()
         self.method = HTTPMethod(rawValue: rawMethod)
         self.timestamp = timestamp