Merge pull request #544 from ParsePlatform/nlutsenko.persist.clearInstallation

Move private clearing of CurrentInstallation to use persistence groups.

Author: nlutsenko

Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.h

@@ -27,7 +27,7 @@ extern NSString *const PFCurrentInstallationPinName;
 
 PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationController : NSObject <PFCurrentObjectControlling>
 
-@property (nonatomic, weak, readonly) id<PFFileManagerProvider, PFInstallationIdentifierStoreProvider> commonDataSource;
+@property (nonatomic, weak, readonly) id<PFInstallationIdentifierStoreProvider> commonDataSource;
 @property (nonatomic, weak, readonly) id<PFObjectFilePersistenceControllerProvider> coreDataSource;
 
 ///--------------------------------------
@@ -36,11 +36,11 @@ PF_TV_UNAVAILABLE PF_WATCH_UNAVAILABLE @interface PFCurrentInstallationControlle
 
 - (instancetype)init NS_UNAVAILABLE;
 - (instancetype)initWithStorageType:(PFCurrentObjectStorageType)dataStorageType
-                   commonDataSource:(id<PFFileManagerProvider, PFInstallationIdentifierStoreProvider>)commonDataSource
+                   commonDataSource:(id<PFInstallationIdentifierStoreProvider>)commonDataSource
                      coreDataSource:(id<PFObjectFilePersistenceControllerProvider>)coreDataSource;
 
 + (instancetype)controllerWithStorageType:(PFCurrentObjectStorageType)dataStorageType
-                         commonDataSource:(id<PFFileManagerProvider, PFInstallationIdentifierStoreProvider>)commonDataSource
+                         commonDataSource:(id<PFInstallationIdentifierStoreProvider>)commonDataSource
                            coreDataSource:(id<PFObjectFilePersistenceControllerProvider>)coreDataSource;
 
 ///--------------------------------------

Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.m

@@ -11,7 +11,6 @@
 
 #import "BFTask+Private.h"
 #import "PFAsyncTaskQueue.h"
-#import "PFFileManager.h"
 #import "PFInstallationIdentifierStore.h"
 #import "PFInstallationPrivate.h"
 #import "PFMacros.h"
@@ -48,7 +47,7 @@ @implementation PFCurrentInstallationController
 ///--------------------------------------
 
 - (instancetype)initWithStorageType:(PFCurrentObjectStorageType)storageType
-                   commonDataSource:(id<PFFileManagerProvider, PFInstallationIdentifierStoreProvider>)commonDataSource
+                   commonDataSource:(id<PFInstallationIdentifierStoreProvider>)commonDataSource
                      coreDataSource:(id<PFObjectFilePersistenceControllerProvider>)coreDataSource {
     self = [super init];
     if (!self) return nil;
@@ -64,7 +63,7 @@ - (instancetype)initWithStorageType:(PFCurrentObjectStorageType)storageType
 }
 
 + (instancetype)controllerWithStorageType:(PFCurrentObjectStorageType)storageType
-                         commonDataSource:(id<PFFileManagerProvider, PFInstallationIdentifierStoreProvider>)commonDataSource
+                         commonDataSource:(id<PFInstallationIdentifierStoreProvider>)commonDataSource
                            coreDataSource:(id<PFObjectFilePersistenceControllerProvider>)coreDataSource {
     return [[self alloc] initWithStorageType:storageType
                             commonDataSource:commonDataSource
@@ -183,8 +182,7 @@ - (BFTask *)clearCurrentInstallationAsync {
             [tasks addObject:unpinTask];
         }
 
-        NSString *path = [self.fileManager parseDataItemPathForPathComponent:PFCurrentInstallationFileName];
-        BFTask *fileTask = [PFFileManager removeItemAtPathAsync:path];
+        BFTask *fileTask = [self.coreDataSource.objectFilePersistenceController removePersistentObjectAsyncForKey:PFCurrentInstallationFileName];
         [tasks addObject:fileTask];
 
         return [BFTask taskForCompletionOfAllTasks:tasks];
@@ -247,10 +245,6 @@ - (BFTask *)_saveCurrentInstallationToDiskAsync:(PFInstallation *)installation {
 #pragma mark - Accessors
 ///--------------------------------------
 
-- (PFFileManager *)fileManager {
-    return self.commonDataSource.fileManager;
-}
-
 - (PFObjectFilePersistenceController *)objectFilePersistenceController {
     return self.coreDataSource.objectFilePersistenceController;
 }