Resources/Settings.bundle/Root.inApp.plist

@@ -78,16 +78,6 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<true/>
-			<key>Key</key>
-			<string>MLDecrapifyTitles</string>
-			<key>Title</key>
-			<string>SETTINGS_DECRAPIFY</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSMultiValueSpecifier</string>
@@ -610,6 +600,32 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>SETTINGS_MEDIA_LIBRARY</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<integer>0</integer>
+			<key>Type</key>
+			<string>IASKButtonSpecifier</string>
+			<key>Key</key>
+			<string>forceMediaLibraryRescan</string>
+			<key>Title</key>
+			<string>SETTINGS_MEDIA_LIBRARY_RESCAN</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>MLDecrapifyTitles</string>
+			<key>Title</key>
+			<string>SETTINGS_DECRAPIFY</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>

Resources/Settings.bundle/Root.plist

@@ -10,16 +10,6 @@
 			<key>Title</key>
 			<string>SETTINGS_GENERIC_TITLE</string>
 		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<true/>
-			<key>Key</key>
-			<string>MLDecrapifyTitles</string>
-			<key>Title</key>
-			<string>SETTINGS_DECRAPIFY</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSMultiValueSpecifier</string>
@@ -584,6 +574,22 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>SETTINGS_MEDIA_LIBRARY</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>MLDecrapifyTitles</string>
+			<key>Title</key>
+			<string>SETTINGS_DECRAPIFY</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>

Resources/Settings.bundle/en.lproj/Root.strings

@@ -17,7 +17,6 @@
 "SETTINGS_PASSCODE_LOCK" = "Passcode Lock";
 "SETTINGS_PASSCODE_LOCK_ALLOWTOUCHID" = "Allow Touch ID for unlock";
 "SETTINGS_PASSCODE_LOCK_ALLOWFACEID" = "Allow Face ID for unlock";
-"SETTINGS_DECRAPIFY" = "Optimize item names for display";
 "SETTINGS_VIDEO_FULLSCREEN" = "Play video in fullscreen";
 "SETTINGS_CONTINUE_VIDEO_PLAYBACK" = "Continue video playback";
 "SETTINGS_CONTINUE_AUDIO_PLAYBACK" = "Continue audio playback";
@@ -87,6 +86,10 @@
 "SETTINGS_SEND_FEEDBACK" = "Send Feedback";
 "SETTINGS_SEND_RATING" = "Please Rate VLC for iOS";
 
+"SETTINGS_MEDIA_LIBRARY" = "Media library";
+"SETTINGS_MEDIA_LIBRARY_RESCAN" = "Force VLC to rescan the media library";
+"SETTINGS_DECRAPIFY" = "Optimize item names for display";
+
 "SETTINGS_FILE_SYNC" = "File Synchronization";
 "SETTINGS_WIFISHARING_IPv6" = "IPv6 support for WiFi Sharing";
 "SETTINGS_UNLINK_DROPBOX" = "Unlink from Dropbox";

Resources/en.lproj/Localizable.strings

@@ -68,6 +68,7 @@
 "BUTTON_CONTINUE" = "Continue";
 "BUTTON_SET" = "Set";
 "BUTTON_RESET" = "Reset";
+"BUTTON_RESCAN" = "Rescan";
 "PRIVATE_PLAYBACK_TOGGLE" = "Private Playback";
 "SCAN_SUBTITLE_TOGGLE" = "Scan for Subtitles (http-only)";
 
@@ -386,3 +387,7 @@
 /* MediaMoreOptionsActionSheet */
 "EQUALIZER_CELL_TITLE" = "Equalizer";
 "MORE_OPTIONS_HEADER_TITLE" = "Video Options";
+
+/* Settings - Force rescan alert */
+"FORCE_RESCAN_TITLE" = "Force media library rescan";
+"FORCE_RESCAN_MESSAGE" = "Do you want to force VLC to rescan your media library?\nIt could take some time.";

SharedSources/MediaLibraryService.swift

@@ -332,6 +332,10 @@ extension MediaLibraryService {
         medialib.reload()
     }
 
+    @objc func forceRescan() {
+        medialib.forceRescan()
+    }
+
     @objc func reindexAllMediaForSpotlight() {
         media(ofType: .video).forEach { $0.updateCoreSpotlightEntry() }
         media(ofType: .audio).forEach { $0.updateCoreSpotlightEntry() }

SharedSources/VLCMetadata.m

@@ -51,12 +51,24 @@
         self.artworkImage = [media thumbnailImage];
         self.isAudioOnly = [media subtype] == VLCMLMediaSubtypeAlbumTrack;
     } else { // We're streaming something
-        self.artworkImage = nil;
-        self.trackNumber = nil;
-        self.artist = nil;
-        self.albumName = nil;
+        BOOL isDarktheme = PresentationTheme.current == PresentationTheme.darkTheme;
+        self.artworkImage = isDarktheme ? [UIImage imageNamed:@"song-placeholder-dark"]
+                                        : [UIImage imageNamed:@"song-placeholder-white"];
         [self fillFromMetaDict:mediaPlayer];
-        self.title = [[mediaPlayer.media url] lastPathComponent];
+    }
+
+    [self checkIsAudioOnly:mediaPlayer];
+
+    if (self.isAudioOnly) {
+        if (self.artworkImage) {
+            if (self.artist)
+                self.title = [self.title stringByAppendingFormat:@" — %@", self.artist];
+            if (self.albumName)
+                self.title = [self.title stringByAppendingFormat:@" — %@", self.albumName];
+        }
+        if (self.title.length < 1)
+            self.title = [[mediaPlayer.media url] lastPathComponent];
+
     }
     [self updatePlaybackRate:mediaPlayer];
 

Sources/VLCBoxController.m

@@ -194,11 +194,12 @@
     NSArray *searchPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *filePath = [searchPaths[0] stringByAppendingFormat:@"/%@", file.name];
 
-    [self loadFile:file intoPath:filePath];
-
-    if ([self.delegate respondsToSelector:@selector(operationWithProgressInformationStarted)])
-        [self.delegate operationWithProgressInformationStarted];
+    [self loadFile:file intoPath:[self createPotentialPathFrom:filePath]];
 
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([self.delegate respondsToSelector:@selector(operationWithProgressInformationStarted)])
+            [self.delegate operationWithProgressInformationStarted];
+    });
     _downloadInProgress = YES;
 }
 #endif
@@ -263,8 +264,11 @@
         }
 
         CGFloat progress = (CGFloat)bytesReceived / (CGFloat)expectedTotalBytes;
-        if ([self.delegate respondsToSelector:@selector(currentProgressInformation:)])
-            [self.delegate currentProgressInformation:progress];
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if ([self.delegate respondsToSelector:@selector(currentProgressInformation:)])
+                [self.delegate currentProgressInformation:progress];
+        });
     };
 
     [[BoxSDK sharedSDK].filesManager downloadFileWithID:file.modelID outputStream:outputStream requestBuilder:nil success:successBlock failure:failureBlock progress:progressBlock];
@@ -292,8 +296,11 @@
     [formatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
 
     NSString *remainingTime = [formatter stringFromDate:date];
-    if ([self.delegate respondsToSelector:@selector(updateRemainingTime:)])
-        [self.delegate updateRemainingTime:remainingTime];
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([self.delegate respondsToSelector:@selector(updateRemainingTime:)])
+            [self.delegate updateRemainingTime:remainingTime];
+    });
 }
 
 - (void)downloadSuccessful
@@ -307,8 +314,10 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:NSNotification.VLCNewFileAddedNotification
                                                         object:self];
 #endif
-    if ([self.delegate respondsToSelector:@selector(operationWithProgressInformationStopped)])
-        [self.delegate operationWithProgressInformationStopped];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([self.delegate respondsToSelector:@selector(operationWithProgressInformationStopped)])
+            [self.delegate operationWithProgressInformationStopped];
+    });
     _downloadInProgress = NO;
 
     [self _triggerNextDownload];
@@ -317,8 +326,10 @@
 - (void)downloadFailedWithError:(NSError*)error
 {
     APLog(@"BoxFile download failed with error %li", (long)error.code);
-    if ([self.delegate respondsToSelector:@selector(operationWithProgressInformationStopped)])
-        [self.delegate operationWithProgressInformationStopped];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if ([self.delegate respondsToSelector:@selector(operationWithProgressInformationStopped)])
+            [self.delegate operationWithProgressInformationStopped];
+    });
     _downloadInProgress = NO;
 
     [self _triggerNextDownload];

Sources/VLCBoxTableViewController.m

@@ -51,9 +51,9 @@
     self.controller.delegate = self;
 
 #if TARGET_OS_IOS
-    self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Box"]];
+    self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"BoxCell"]];
 
-    [self.cloudStorageLogo setImage:[UIImage imageNamed:@"Box"]];
+    [self.cloudStorageLogo setImage:[UIImage imageNamed:@"box"]];
 
     [self.cloudStorageLogo sizeToFit];
     self.cloudStorageLogo.center = self.view.center;
@@ -118,8 +118,7 @@
         self.navigationController.navigationBar.prefersLargeTitles = NO;
     }
 
-    if (!_listOfFiles || _listOfFiles.count == 0)
-        [self requestInformationForCurrentPath];
+    [self updateViewAfterSessionChange];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -136,7 +135,11 @@
 - (void)mediaListUpdated
 {
     _listOfFiles = [[VLCBoxController sharedInstance].currentListFiles copy];
-    [self.tableView performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO];
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self.tableView reloadData];
+        [super mediaListUpdated];
+    });
 }
 
 - (VLCCloudStorageTableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -277,7 +280,8 @@
     [ubiquitousStore setString:token forKey:kVLCStoreBoxCredentials];
     [ubiquitousStore synchronize];
     self.authorizationInProgress = YES;
-    [self updateViewAfterSessionChange];
+    [self performSelectorOnMainThread:@selector(updateViewAfterSessionChange)
+                           withObject:nil waitUntilDone:NO];
     self.authorizationInProgress = NO;
 }
 

Sources/VLCCloudStorageTableViewCell.m

@@ -197,6 +197,7 @@
             self.folderTitleLabel.text = self.boxFile.name;
             self.titleLabel.hidden = self.subtitleLabel.hidden = YES;
             self.folderTitleLabel.hidden = NO;
+            self.downloadButton.hidden = YES;
         } else {
             NSString *title = self.boxFile.name;
             self.titleLabel.text = title;

Sources/VLCHTTPFileDownloader.m

@@ -101,11 +101,10 @@
     VLCHTTPFileDownloaderTask *downloadTask = [[VLCHTTPFileDownloaderTask alloc] init];
     downloadTask.url = url;
     NSString *downloadFileName;
-    if (fileName) {
-        downloadFileName = [self createPotentialNameFromName:fileName];
-    } else {
-        downloadFileName = [url.lastPathComponent stringByRemovingPercentEncoding];
-    }
+
+    fileName = fileName ?: [url.lastPathComponent stringByRemovingPercentEncoding];
+
+    downloadFileName = [self createPotentialNameFromName:fileName];
 
     if (downloadFileName.pathExtension.length == 0 || ![downloadFileName isSupportedFormat]) {
         NSString *urlExtension = url.pathExtension;

Sources/VLCMovieViewController.m

@@ -73,7 +73,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     BOOL _volumeGestureEnabled;
     BOOL _playPauseGestureEnabled;
     BOOL _brightnessGestureEnabled;
-    BOOL _seekGestureEnabled;
+    BOOL _swipeSeekGestureEnabled;
     BOOL _closeGestureEnabled;
     BOOL _variableJumpDurationEnabled;
     BOOL _playbackWillClose;
@@ -654,7 +654,7 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     _volumeGestureEnabled = [[defaults objectForKey:kVLCSettingVolumeGesture] boolValue];
     _playPauseGestureEnabled = [[defaults objectForKey:kVLCSettingPlayPauseGesture] boolValue];
     _brightnessGestureEnabled = [[defaults objectForKey:kVLCSettingBrightnessGesture] boolValue];
-    _seekGestureEnabled = [[defaults objectForKey:kVLCSettingSeekGesture] boolValue];
+    _swipeSeekGestureEnabled = [[defaults objectForKey:kVLCSettingSeekGesture] boolValue];
     _closeGestureEnabled = [[defaults objectForKey:kVLCSettingCloseGesture] boolValue];
     _variableJumpDurationEnabled = [[defaults objectForKey:kVLCSettingVariableJumpDuration] boolValue];
 }
@@ -1642,7 +1642,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
     
     switch (_currentPanType) {
         case VLCPanTypeSeek: {
-            if (!_seekGestureEnabled)
+            if (!_swipeSeekGestureEnabled)
                 return;
             double timeRemainingDouble = (-[_vpc remainingTime].intValue*0.001);
             int timeRemaining = timeRemainingDouble;
@@ -1724,7 +1724,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
 - (void)swipeRecognized:(UISwipeGestureRecognizer*)swipeRecognizer
 {
-    if (!_seekGestureEnabled)
+    if (!_swipeSeekGestureEnabled)
         return;
 
     NSString *hudString = @" ";
@@ -1807,9 +1807,6 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
 - (void)doubleTapRecognized:(UITapGestureRecognizer *)tapRecognizer
 {
-    if (!_seekGestureEnabled)
-        return;
-
     CGFloat screenWidth = self.view.frame.size.width;
     CGFloat backwardBoundary = screenWidth / 3.0;
     CGFloat forwardBoundary = 2 * screenWidth / 3.0;

Sources/VLCSettingsController.m

@@ -216,6 +216,8 @@ NSString * const kVLCSectionTableHeaderViewIdentifier = @"VLCSectionTableHeaderV
 
     if ([specifier.type isEqualToString: kIASKPSMultiValueSpecifier]) {
         [self displayActionSheetFor:specifier];
+    } else if ([specifier.type isEqualToString: kIASKButtonSpecifier]) {
+        [self buttonTappedFor:specifier];
     } else {
         [super tableView:tableView didSelectRowAtIndexPath:indexPath];
     }
@@ -237,4 +239,32 @@ NSString * const kVLCSectionTableHeaderViewIdentifier = @"VLCSectionTableHeaderV
     }];
 }
 
+- (void)buttonTappedFor:(IASKSpecifier *)specifier
+{
+    __weak typeof(self) weakSelf = self;
+
+    if ([specifier.specifierDict[@"Key"] isEqual: @"forceMediaLibraryRescan"]) {
+        UIAlertController *alert = [UIAlertController
+                                    alertControllerWithTitle:NSLocalizedString(@"FORCE_RESCAN_TITLE", "")
+                                                     message:NSLocalizedString(@"FORCE_RESCAN_MESSAGE", "")
+                                              preferredStyle:UIAlertControllerStyleAlert];
+
+        UIAlertAction* rescanAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"BUTTON_RESCAN", "")
+                                                                style:UIAlertActionStyleDestructive
+                                                              handler:^(UIAlertAction * action) {
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+                [strongSelf->_medialibraryService forceRescan];
+            });
+        }];
+        UIAlertAction* cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"BUTTON_CANCEL", "")
+                                                               style:UIAlertActionStyleCancel
+                                                             handler:nil];
+
+        [alert addAction:cancelAction];
+        [alert addAction:rescanAction];
+        [self presentViewController:alert animated:YES completion:nil];
+    }
+}
+
 @end

Sources/VLCSettingsTableViewCell.swift

@@ -35,6 +35,8 @@ class VLCSettingsTableViewCell: UITableViewCell {
             accessoryType = .disclosureIndicator
         case kIASKPSMultiValueSpecifier:
             accessoryType = .none
+        case kIASKButtonSpecifier:
+            accessoryType = .none
         default:
             assertionFailure("\(reuseIdentifier) has not been defined for VLCSettingsTableViewCell")
         }
@@ -57,6 +59,8 @@ class VLCSettingsTableViewCell: UITableViewCell {
             configureMultiValue(specifier, settingsValue)
         case kIASKOpenURLSpecifier:
             break
+        case kIASKButtonSpecifier:
+            break
         default:
             assertionFailure("\(specifier.type() ?? "nil") has not been defined for VLCSettingsTableViewCell")
         }