Proper RSH8b and RSH3g2a behavior.

Source/ARTLocalDevice.m

@@ -122,6 +122,21 @@ - (BOOL)setupDetailsWithClientId:(NSString *)clientId {
     return YES;
 }
 
+- (void)resetDetails {
+    self.id = @"";
+    self.secret = nil;
+    self.clientId = nil;
+    [_storage setObject:nil forKey:ARTDeviceIdKey];
+    [self setAndPersistIdentityTokenDetails:nil];
+    NSArray *supportedTokenTypes = @[
+        ARTAPNSDeviceDefaultTokenType,
+        ARTAPNSDeviceLocationTokenType
+    ];
+    for (NSString *tokenType in supportedTokenTypes) {
+        [self setAndPersistAPNSDeviceToken:nil tokenType:tokenType];
+    }
+}
+
 + (NSString *)generateId {
     return [NSUUID new].UUIDString;
 }
@@ -173,9 +188,4 @@ - (BOOL)isRegistered {
     return _identityTokenDetails != nil;
 }
 
-- (void)clearIdentityTokenDetailsAndClientId {
-    [self setAndPersistIdentityTokenDetails:nil];
-    self.clientId = nil;
-}
-
 @end

Source/ARTPushActivationState.m

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

Source/ARTRest.m

@@ -789,6 +789,13 @@ - (void)setupLocalDevice {
     });
 }
 
+- (void)resetLocalDevice {
+    ARTLocalDevice *device = [self device_nosync];
+    dispatch_sync([ARTRestInternal deviceAccessQueue], ^{
+        [device resetDetails];
+    });
+}
+
 - (void)resetDeviceSingleton {
     dispatch_sync([ARTRestInternal deviceAccessQueue], ^{
         sharedDeviceNeedsLoading_onlyAccessOnDeviceAccessQueue = YES;

Source/PrivateHeaders/Ably/ARTLocalDevice+Private.h

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

Source/PrivateHeaders/Ably/ARTRest+Private.h

@@ -77,6 +77,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 #if TARGET_OS_IOS
 - (void)setupLocalDevice;
+- (void)resetLocalDevice;
+
 // This is only intended to be called from test code.
 - (void)resetDeviceSingleton;