Pushwoosh iOS SDK 6.5.7

https://github.com/Pushwoosh/pushwoosh-ios-sdk/releases/tag/6.5.7

Documentation/Pushwoosh.md

@@ -85,6 +85,9 @@ Pushwoosh class offers access to the singleton-instance of the push manager resp
 	<tr>
 		<td><a href="#1a0e0d155a862e9ca4c3839e2c3f8d4115">- (NSString *_Nonnull)getHWID</a></td>
 	</tr>
+	<tr>
+		<td><a href="#1ad7d1b0957e50d70e5ae445a295744350">- (NSString *_Nonnull)getUserId</a></td>
+	</tr>
 	<tr>
 		<td><a href="#1ab614f1fcd98bce58db800a09baf22f6d">- (void)setUserId:(NSString *_Nonnull)userId completion:(void(^)(NSError *_Nullable error))completion</a></td>
 	</tr>
@@ -370,6 +373,12 @@ Gets HWID. Unique device identifier that used in all API calls with Pushwoosh. T
 ----------  
   
 
+#### <a name="1ad7d1b0957e50d70e5ae445a295744350"></a>- (NSString \*<a href="Pushwoosh.md#1aa7caab3e4111d4f4756a1e8d56d01c26">_Nonnull</a>)getUserId  
+Gets UserId.<br/><br/><br/><strong>Returns</strong> userId. If the userId hasn't been set previously, then the userId is assigned the HWID. 
+
+----------  
+  
+
 #### <a name="1ab614f1fcd98bce58db800a09baf22f6d"></a>- (void)setUserId:(NSString \*<a href="Pushwoosh.md#1aa7caab3e4111d4f4756a1e8d56d01c26">_Nonnull</a>)userId completion:(void(^)(NSError \*<a href="Pushwoosh.md#1ae9429c76f749caa36e1f798ef3e06c6c">_Nullable</a> error))completion  
 Set User indentifier. This could be Facebook ID, username or email, or any other user ID. This allows data and events to be matched across multiple user devices. If setUserId succeeds competion is called with nil argument. If setUserId fails completion is called with error.<br/><br/><br/><strong>Parameters</strong><br/>
 <table>

Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.5.6"
+#define PUSHWOOSH_VERSION @"6.5.7"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
@@ -365,6 +365,13 @@ Unregisters from push notifications.
  */
 - (NSString * _Nonnull)getHWID;
 
+/**
+ Gets UserId.
+ 
+ @return userId. If the userId hasn't been set previously, then the userId is assigned the HWID.
+ */
+- (NSString * _Nonnull)getUserId;
+
 /**
  Returns dictionary with enabled remove notificaton types.
  

XCFramework/Pushwoosh.xcframework/Info.plist

@@ -19,34 +19,34 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_i386_x86_64-simulator</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>Pushwoosh.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>i386</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>ios-arm64_i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Pushwoosh.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>i386</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

XCFramework/Pushwoosh.xcframework/ios-arm64_armv7/Pushwoosh.framework/Headers/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.5.6"
+#define PUSHWOOSH_VERSION @"6.5.7"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
@@ -365,6 +365,13 @@ Unregisters from push notifications.
  */
 - (NSString * _Nonnull)getHWID;
 
+/**
+ Gets UserId.
+ 
+ @return userId. If the userId hasn't been set previously, then the userId is assigned the HWID.
+ */
+- (NSString * _Nonnull)getUserId;
+
 /**
  Returns dictionary with enabled remove notificaton types.
  

XCFramework/Pushwoosh.xcframework/ios-arm64_i386_x86_64-simulator/Pushwoosh.framework/Headers/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.5.6"
+#define PUSHWOOSH_VERSION @"6.5.7"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
@@ -365,6 +365,13 @@ Unregisters from push notifications.
  */
 - (NSString * _Nonnull)getHWID;
 
+/**
+ Gets UserId.
+ 
+ @return userId. If the userId hasn't been set previously, then the userId is assigned the HWID.
+ */
+- (NSString * _Nonnull)getUserId;
+
 /**
  Returns dictionary with enabled remove notificaton types.
  

XCFramework/Pushwoosh.xcframework/ios-arm64_i386_x86_64-simulator/Pushwoosh.framework/_CodeSignature/CodeResources

@@ -50,7 +50,7 @@
 		</data>
 		<key>Headers/Pushwoosh.h</key>
 		<data>
-		A+GgT1IuLu5/OHhKsBhlKGrqGB0=
+		NKbTKmTdt103f1ytahLEOgKWh5Y=
 		</data>
 		<key>Info.plist</key>
 		<data>
@@ -188,11 +188,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			A+GgT1IuLu5/OHhKsBhlKGrqGB0=
+			NKbTKmTdt103f1ytahLEOgKWh5Y=
 			</data>
 			<key>hash2</key>
 			<data>
-			+NQIDzZyBTbxCNHCKuCBEZZNdIy1fOzjBdOioVTjsVc=
+			vkxxrmq0UKesrycGww6u8w8UCG9pF4fAEYMePp+H7s4=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.5.6"
+#define PUSHWOOSH_VERSION @"6.5.7"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
@@ -365,6 +365,13 @@ Unregisters from push notifications.
  */
 - (NSString * _Nonnull)getHWID;
 
+/**
+ Gets UserId.
+ 
+ @return userId. If the userId hasn't been set previously, then the userId is assigned the HWID.
+ */
+- (NSString * _Nonnull)getUserId;
+
 /**
  Returns dictionary with enabled remove notificaton types.
  

iOS_SDK/Pushwoosh/Pushwoosh.podspec

@@ -5,7 +5,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Pushwoosh"
-  s.version      = "6.5.6"
+  s.version      = "6.5.7"
   s.summary      = "Push notifications library by Pushwoosh."
   s.platform     = :ios
 

iOS_SDK/Pushwoosh/Pushwoosh/Persistence/PWPreferences.m

@@ -84,10 +84,19 @@ - (instancetype)init {
                 [[NSUserDefaults standardUserDefaults] removeObjectForKey:KeyUserId];
                 [_defaults setObject:_userId forKey:KeyUserId];
             } else {
-                _userId = [_defaults objectForKey:KeyUserId];
+                if ([_defaults objectForKey:KeyUserId]) {
+                    _userId = [_defaults objectForKey:KeyUserId];
+                } else {
+                    _userId = _hwid;
+                }
             }
         } else {
-            _userId = [[NSUserDefaults standardUserDefaults] objectForKey:KeyUserId];
+            NSString *userId = [[NSUserDefaults standardUserDefaults] objectForKey:KeyUserId];
+            if (userId) {
+                _userId = userId;
+            } else {
+                _userId = _hwid;
+            }
         }
 
 		_lastRegTime = [[NSUserDefaults standardUserDefaults] objectForKey:KeyLastRegTime];
@@ -471,8 +480,7 @@ + (NSString *)readProductionAppCodeAndUpdateIfNeeded {
     NSString *userDefaultsAppCode = [[NSUserDefaults standardUserDefaults] objectForKey:KeyAppId];
 
     if (userDefaultsAppCode && infoPlistAppCode) {
-        //Info plist app code updated, we need update cache Info.plist app code and change defaults app code
-        if (![infoPlistAppCode isEqualToString:saveInfoPlistAppCode]) {
+         if (![infoPlistAppCode isEqualToString:saveInfoPlistAppCode]) {
             if (![userDefaultsAppCode isEqualToString:infoPlistAppCode]) {
                 [self resetCache];
             }

iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.5.6"
+#define PUSHWOOSH_VERSION @"6.5.7"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
@@ -365,6 +365,13 @@ Unregisters from push notifications.
  */
 - (NSString * _Nonnull)getHWID;
 
+/**
+ Gets UserId.
+ 
+ @return userId. If the userId hasn't been set previously, then the userId is assigned the HWID.
+ */
+- (NSString * _Nonnull)getUserId;
+
 /**
  Returns dictionary with enabled remove notificaton types.
  

iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.m

@@ -223,6 +223,10 @@ - (NSString *)getHWID {
     return [PWPreferences preferences].hwid;
 }
 
+- (NSString *)getUserId {
+    return [PWPreferences preferences].userId;
+}
+
 - (NSString *)applicationCode {
     return [PWPreferences preferences].appCode;
 }

iOS_SDK/Pushwoosh/PushwooshXCFramework.podspec

@@ -5,7 +5,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "PushwooshXCFramework"
-  s.version      = "6.5.6"
+  s.version      = "6.5.7"
   s.summary      = "Push notifications library by Pushwoosh."
   s.platform     = :ios