Skip to content
This repository was archived by the owner on Jan 21, 2022. It is now read-only.

DE324142 : [iOS][MASFoundation] Device de-registration should adhere … #104

Merged
BobbyWeber merged 1 commit into from
Oct 24, 2017
Merged

DE324142 : [iOS][MASFoundation] Device de-registration should adhere … #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions MASFoundation/Classes/_private_/services/model/MASModelService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,11 @@ - (void)deregisterCurrentDeviceWithCompletion:(MASCompletionErrorBlock)completio
//
MASIMutableOrderedDictionary *mutableHeaderInfo = [MASIMutableOrderedDictionary new];

//
// Post the Mobile SDK will attempt to deregister device
//
[[NSNotificationCenter defaultCenter] postNotificationName:MASDeviceWillDeregisterNotification object:self];

__block MASModelService *blockSelf = self;

//
Expand All @@ -694,6 +699,23 @@ - (void)deregisterCurrentDeviceWithCompletion:(MASCompletionErrorBlock)completio
andHeaders:mutableHeaderInfo
completion:^(NSDictionary *responseInfo, NSError *error)
{
//
// Detect if error, if so stop here
//
if(error)
{
//
// Post the did fail to deregister in cloud notification
//
[[NSNotificationCenter defaultCenter] postNotificationName:MASDeviceDidFailToDeregisterNotification object:self];

//
// Notify
//
if(completion) completion(NO, [NSError errorFromApiResponseInfo:responseInfo andError:error]);

return;
}

//
// Clear currentUser object upon log-out
Expand Down Expand Up @@ -727,24 +749,6 @@ - (void)deregisterCurrentDeviceWithCompletion:(MASCompletionErrorBlock)completio
//
[[NSNotificationCenter defaultCenter] postNotificationName:MASDeviceDidDeregisterOnDeviceNotification object:self];

//
// Detect if error, if so stop here
//
if(error)
{
//
// Post the did fail to deregister in cloud notification
//
[[NSNotificationCenter defaultCenter] postNotificationName:MASDeviceDidFailToDeregisterNotification object:self];

//
// Notify
//
if(completion) completion(NO, [NSError errorFromApiResponseInfo:responseInfo andError:error]);

return;
}

//
// Post the did deregister in cloud notification
//
Expand Down