ソースを参照

Remove deprecated medialibrary code

VLCMigrationViewController: Remove completionHandler

AppDelegate: Remove migration related code
Soomin Lee 6 年 前
コミット
a18987edfa

+ 2 - 30
Sources/VLCAppDelegate.m

@@ -22,7 +22,6 @@
 #import "NSString+SupportedMedia.h"
 #import "UIDevice+VLC.h"
 #import "VLCHTTPUploaderController.h"
-#import "VLCMigrationViewController.h"
 #import "VLCPlaybackController.h"
 #import "VLCPlaybackController+MediaLibrary.h"
 #import <MediaPlayer/MediaPlayer.h>
@@ -37,7 +36,6 @@
 
 @interface VLCAppDelegate ()
 {
-    BOOL _isRunningMigration;
     BOOL _isComingFromHandoff;
     VLCKeychainCoordinator *_keychainCoordinator;
     AppCoordinator *appCoordinator;
@@ -113,33 +111,7 @@
         [[MLMediaLibrary sharedMediaLibrary] setSpotlightIndexingEnabled:spotlightEnabled];
         [[MLMediaLibrary sharedMediaLibrary] applicationWillStart];
     };
-
-    NSError *error = nil;
-
-    if ([[MLMediaLibrary sharedMediaLibrary] libraryMigrationNeeded]){
-        _isRunningMigration = YES;
-
-        VLCMigrationViewController *migrationController = [[VLCMigrationViewController alloc] initWithNibName:@"VLCMigrationViewController" bundle:nil];
-        migrationController.completionHandler = ^{
-
-            //migrate
-            setupBlock();
-            self->_isRunningMigration = NO;
-            [[MLMediaLibrary sharedMediaLibrary] updateMediaDatabase];
-            [[VLCMediaFileDiscoverer sharedInstance] updateMediaList];
-        };
-
-        self.window.rootViewController = migrationController;
-        [self.window makeKeyAndVisible];
-
-    } else {
-        if (error != nil) {
-            APLog(@"removed persistentStore since it was corrupt");
-            NSURL *storeURL = ((MLMediaLibrary *)[MLMediaLibrary sharedMediaLibrary]).persistentStoreURL;
-            [[NSFileManager defaultManager] removeItemAtURL:storeURL error:&error];
-        }
-        setupBlock();
-    }
+    setupBlock();
 
     /* add our static shortcut items the dynamic way to ease l10n and dynamic elements to be introduced later */
     if (@available(iOS 9, *)) {
@@ -263,7 +235,7 @@ didFailToContinueUserActivityWithType:(NSString *)userActivityType
 
 - (void)applicationDidBecomeActive:(UIApplication *)application
 {
-    if (!_isRunningMigration && !_isComingFromHandoff) {
+    if (!_isComingFromHandoff) {
         [[MLMediaLibrary sharedMediaLibrary] updateMediaDatabase];
       //  [[VLCMediaFileDiscoverer sharedInstance] updateMediaList];
         [[VLCPlaybackController sharedInstance] recoverDisplayedMetadata];

+ 0 - 1
Sources/VLCMigrationViewController.h

@@ -16,5 +16,4 @@
 
 @property(nonatomic) IBOutlet UILabel *statusLabel;
 @property(nonatomic) IBOutlet UIActivityIndicatorView *spinner;
-@property(nonatomic, copy) void (^completionHandler)(void);
 @end

+ 2 - 8
Sources/VLCMigrationViewController.m

@@ -18,15 +18,9 @@
     return self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
 }
 
-- (void)viewDidLoad {
+- (void)viewDidLoad
+{
     [super viewDidLoad];
     [self.statusLabel setText:NSLocalizedString(@"UPGRADING_LIBRARY", "")];
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        APLog(@"migrating coredata");
-        [[MLMediaLibrary sharedMediaLibrary] migrateLibrary];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            self.completionHandler();
-        });
-    });
 }
 @end