SharedSources/MediaLibraryModel/AlbumModel.swift

@@ -112,18 +112,14 @@ extension VLCMLAlbum: MediaCollectionModel {
         return nil
     }
 
-    func files() -> [VLCMLMedia]? {
-        return tracks
+    func files(with criteria: VLCMLSortingCriteria = .alpha,
+               desc: Bool = false) -> [VLCMLMedia]? {
+        return tracks(with: criteria, desc: desc)
     }
 
     func title() -> String {
         return title
     }
-
-    func sortFilesInCollection(with criteria: VLCMLSortingCriteria,
-                               desc: Bool) -> [VLCMLMedia]? {
-        return nil
-    }
 }
 
 extension VLCMLAlbum {

SharedSources/MediaLibraryModel/ArtistModel.swift

@@ -98,8 +98,9 @@ extension VLCMLArtist: MediaCollectionModel {
         return SortModel([.alpha])
     }
 
-    func files() -> [VLCMLMedia]? {
-        return tracks()
+    func files(with criteria: VLCMLSortingCriteria = .alpha,
+               desc: Bool = false) -> [VLCMLMedia]? {
+        return tracks(with: criteria, desc: desc)
     }
 
     func title() -> String {

SharedSources/MediaLibraryModel/CollectionModel.swift

@@ -66,7 +66,7 @@ class CollectionModel: MLBaseModel {
     }
 
     func sort(by criteria: VLCMLSortingCriteria, desc: Bool) {
-        files = mediaCollection.sortFilesInCollection(with: criteria, desc: desc) ?? []
+        files = mediaCollection.files(with: criteria, desc: desc) ?? []
         sortModel.currentSort = criteria
         sortModel.desc = desc
         updateView?()

SharedSources/MediaLibraryModel/GenreModel.swift

@@ -123,16 +123,12 @@ extension VLCMLGenre: MediaCollectionModel {
         return SortModel([.alpha])
     }
 
-    func files() -> [VLCMLMedia]? {
-        return tracks()
+    func files(with criteria: VLCMLSortingCriteria = .alpha,
+               desc: Bool = false) -> [VLCMLMedia]? {
+        return tracks(with: criteria, desc: desc)
     }
 
     func title() -> String {
         return name
     }
-
-    func sortFilesInCollection(with criteria: VLCMLSortingCriteria,
-                               desc: Bool) -> [VLCMLMedia]? {
-        return nil
-    }
 }

SharedSources/MediaLibraryModel/MediaLibraryBaseModel.swift

@@ -73,11 +73,10 @@ protocol SearchableMLModel {
 }
 
 protocol MediaCollectionModel {
-    func files() -> [VLCMLMedia]?
+    func files(with criteria: VLCMLSortingCriteria,
+               desc: Bool) -> [VLCMLMedia]?
     func sortModel() -> SortModel?
     func title() -> String
-    func sortFilesInCollection(with criteria: VLCMLSortingCriteria,
-                               desc: Bool) -> [VLCMLMedia]?
 }
 
 // MARK: - Helper methods
@@ -107,3 +106,10 @@ extension VLCMLObject {
         return lhs.identifier() == rhs.identifier()
     }
 }
+
+extension MediaCollectionModel {
+    func files(with criteria: VLCMLSortingCriteria = .alpha,
+               desc: Bool = false) -> [VLCMLMedia]? {
+        return files(with: criteria, desc: desc)
+    }
+}

SharedSources/MediaLibraryModel/PlaylistModel.swift

@@ -150,16 +150,12 @@ extension VLCMLPlaylist: MediaCollectionModel {
         return nil
     }
 
-    func files() -> [VLCMLMedia]? {
+    func files(with criteria: VLCMLSortingCriteria = .alpha,
+               desc: Bool = false) -> [VLCMLMedia]? {
         return media
     }
 
     func title() -> String {
         return name
     }
-
-    func sortFilesInCollection(with criteria: VLCMLSortingCriteria,
-                               desc: Bool) -> [VLCMLMedia]? {
-        return nil
-    }
 }

SharedSources/MediaLibraryModel/VideoGroupViewModel.swift

@@ -100,18 +100,14 @@ extension VLCMLVideoGroup: MediaCollectionModel {
         return nil
     }
 
-    func files() -> [VLCMLMedia]? {
-        return media()
+    func files(with criteria: VLCMLSortingCriteria,
+               desc: Bool) -> [VLCMLMedia]? {
+        return media(with: criteria, desc: desc)
     }
 
     func title() -> String {
         return name()
     }
-
-    func sortFilesInCollection(with criteria: VLCMLSortingCriteria,
-                               desc: Bool) -> [VLCMLMedia]? {
-        return media(with: criteria, desc: desc)
-    }
 }
 
 // MARK: - VLCMLVideoGroup - Helpers

Sources/MediaCategories/MediaCategoryViewController.swift

@@ -415,8 +415,8 @@ extension MediaCategoryViewController {
         var rightBarButtonItems = [UIBarButtonItem]()
 
         rightBarButtonItems.append(editBarButton)
-        // Sort is only available for VideoGroups
-        if let model = model as? CollectionModel, model.mediaCollection is VLCMLVideoGroup {
+        // Sort is not available for Playlists
+        if let model = model as? CollectionModel, !(model.mediaCollection is VLCMLPlaylist) {
             rightBarButtonItems.append(sortBarButton)
         }
         rightBarButtonItems.append(rendererBarButton)

Sources/VLCMovieViewController.m

@@ -1955,7 +1955,8 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
     UIView *displayView = _playingExternalView.displayView;
 
-    if (displayExternally && _movieView.superview == displayView) {
+    if (displayExternally && displayView
+        && _movieView.superview == displayView) {
         // Adjust constraints for external display
         [NSLayoutConstraint activateConstraints:@[
             [_movieView.leadingAnchor constraintEqualToAnchor:displayView.leadingAnchor],

Sources/VLCOpenInActivity.m

@@ -169,6 +169,9 @@
                                                          handler:^(UIAlertAction * _Nonnull action) {
                                                              [self activityDidFinish:NO];
                                                          }];
+
+    actionController.popoverPresentationController.sourceView = self.presentingViewController.view;
+
     [actionController addAction:cancelAction];
     [self.presentingViewController presentViewController:actionController animated:YES completion:nil];
 }