This partially fixes issue #1177 (deregistration does not clear devic…

…e details) and only resets clientId, since it affects push device registration with a different clientId (after deregistration with previous clientId). This only affects clients that do not restart their apps after deregistration, since clientId is loaded into deviceId once per app launch. This commit resets clientId after deregistration.

Source/ARTLocalDevice.m

@@ -153,4 +153,9 @@ - (BOOL)isRegistered {
     return _identityTokenDetails != nil;
 }
 
+- (void)clearIdentityTokenDetailsAndClientId {
+    [self setAndPersistIdentityTokenDetails:nil];
+    self.clientId = nil;
+}
+
 @end

Source/ARTPushActivationState.m

@@ -275,7 +275,7 @@ - (ARTPushActivationState *)transition:(ARTPushActivationEvent *)event {
     else if ([event isKindOfClass:[ARTPushActivationEventDeregistered class]]) {
         #if TARGET_OS_IOS
         ARTLocalDevice *local = self.machine.rest.device_nosync;
-        [local setAndPersistIdentityTokenDetails:nil];
+        [local clearIdentityTokenDetailsAndClientId];
         #endif
         [self.machine callDeactivatedCallback:nil];
         return [ARTPushActivationStateNotActivated newWithMachine:self.machine logger:self.logger];

Source/PrivateHeaders/Ably/ARTLocalDevice+Private.h

@@ -25,6 +25,7 @@ NSString* ARTAPNSDeviceTokenKeyOfType(NSString * _Nullable tokenType);
 - (void)setAndPersistAPNSDeviceToken:(nullable NSString *)deviceToken;
 - (void)setAndPersistIdentityTokenDetails:(nullable ARTDeviceIdentityTokenDetails *)tokenDetails;
 - (BOOL)isRegistered;
+- (void)clearIdentityTokenDetailsAndClientId;
 
 + (NSString *)generateId;
 + (NSString *)generateSecret;

Test/Tests/PushActivationStateMachineTests.swift

@@ -822,26 +822,35 @@ class PushActivationStateMachineTests: XCTestCase {
 
     // RSH3g2
     func test__054__Activation_state_machine__State_WaitingForDeregistration__on_Event_Deregistered() {
-        beforeEach__Activation_state_machine__State_WaitingForDeregistration()
-
+        storage = MockDeviceStorage(startWith: ARTPushActivationStateWaitingForDeregistration(machine: initialStateMachine, logger: .init(core: MockInternalLogCore())))
+
+        let options = ARTClientOptions(key: "xxxx:xxxx")
+        options.clientId = "client1"
+        let rest = ARTRest(options: options)
+        rest.internal.storage = storage
+        stateMachine = ARTPushActivationStateMachine(rest: rest.internal, delegate: StateMachineDelegate(), logger: .init(core: MockInternalLogCore()))
+
+        XCTAssertEqual(stateMachine.rest.device.clientId, "client1")
+
         var deactivatedCallbackCalled = false
         let hook = stateMachine.testSuite_injectIntoMethod(after: NSSelectorFromString("callDeactivatedCallback:")) {
             deactivatedCallbackCalled = true
         }
         defer { hook.remove() }
 
-        var setAndPersistIdentityTokenDetailsCalled = false
-        let hookDevice = stateMachine.rest.device.testSuite_injectIntoMethod(after: NSSelectorFromString("setAndPersistIdentityTokenDetails:")) {
-            setAndPersistIdentityTokenDetailsCalled = true
+        var clearIdentityTokenDetailsAndClientIdCalled = false
+        let hookDevice = stateMachine.rest.device.testSuite_injectIntoMethod(after: NSSelectorFromString("clearIdentityTokenDetailsAndClientId")) {
+            clearIdentityTokenDetailsAndClientIdCalled = true
         }
         defer { hookDevice.remove() }
 
         stateMachine.send(ARTPushActivationEventDeregistered())
         expect(stateMachine.current).to(beAKindOf(ARTPushActivationStateNotActivated.self))
         XCTAssertTrue(deactivatedCallbackCalled)
-        XCTAssertTrue(setAndPersistIdentityTokenDetailsCalled)
+        XCTAssertTrue(clearIdentityTokenDetailsAndClientIdCalled)
         // RSH3g2a
         XCTAssertNil(stateMachine.rest.device.identityTokenDetails)
+        XCTAssertNil(stateMachine.rest.device.clientId)
     }
 
     // RSH3g3