Merge branch 'release/ios/3.6.5-396'

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+
+### Motivation and Context
+
+> Why is this change required? What problem does it solve?
+
+### Description
+
+> Please describe the changes and how to test.
+
+### Checklist
+
+- [ ] The branch has been rebased onto the `develop` branch.
+- The code followed the code style:
+	-  [ ] `swiftlint` has run to ensure the *Swift* code style is valid.
+	-  [ ] `rubocop -a` has run to ensure the *Ruby* code style is valid.
+- [ ] Remote configuration properties have been properly documented (if relevant).
+- [ ] The documentation has been updated (if relevant).
+- [ ] Issues are linked to the PR, if any.

Application/Resources/Apps/Play RSI/it.lproj/Localizable.strings

@@ -377,7 +377,7 @@
 "Most listened to" = "I più ascoltati";
 
 /* Most searched shows header */
-"Most searched shows" = "Programmi più ricercati";
+"Most searched shows" = "Programmi più cercati";
 
 /* Song list title */
 "Music" = "Musica";
@@ -488,6 +488,10 @@
 /* Title of the button to proceed to the previous onboarding page */
 "Previous" = "Precedente";
 
+/* Button title on CarPlay player for livestream previous programs
+   Livestream previous programs screen title */
+"Previous shows" = "Trasmissioni precedenti";
+
 /* Server setting name */
 "Production" = "Produzione";
 

Application/Resources/Apps/Play RTR/rm.lproj/Localizable.strings

@@ -488,6 +488,10 @@
 /* Title of the button to proceed to the previous onboarding page */
 "Previous" = "Precedent";
 
+/* Button title on CarPlay player for livestream previous programs
+   Livestream previous programs screen title */
+"Previous shows" = "Emissiuns precedentas";
+
 /* Server setting name */
 "Production" = "Producziun";
 

Application/Resources/Apps/Play RTS/fr.lproj/Localizable.strings

@@ -488,6 +488,10 @@
 /* Title of the button to proceed to the previous onboarding page */
 "Previous" = "Précédent";
 
+/* Button title on CarPlay player for livestream previous programs
+   Livestream previous programs screen title */
+"Previous shows" = "Émissions précédentes";
+
 /* Server setting name */
 "Production" = "Production";
 

Application/Resources/Apps/Play SRF/de.lproj/Localizable.strings

@@ -488,6 +488,10 @@
 /* Title of the button to proceed to the previous onboarding page */
 "Previous" = "Zurück";
 
+/* Button title on CarPlay player for livestream previous programs
+   Livestream previous programs screen title */
+"Previous shows" = "Vorherige Sendungen";
+
 /* Server setting name */
 "Production" = "Production";
 

Application/Resources/Apps/Play SWI/en.lproj/Localizable.strings

@@ -488,6 +488,10 @@
 /* Title of the button to proceed to the previous onboarding page */
 "Previous" = "Previous";
 
+/* Button title on CarPlay player for livestream previous programs
+   Livestream previous programs screen title */
+"Previous shows" = "Previous shows";
+
 /* Server setting name */
 "Production" = "Production";
 

Application/Resources/Images/CommonImages.xcassets/Images/playback_speed.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "playback_speed.pdf",
+      "idiom" : "iphone"
+    },
+    {
+      "filename" : "playback_speed 1.pdf",
+      "idiom" : "ipad"
+    },
+    {
+      "filename" : "playback_speed-2.pdf",
+      "idiom" : "car"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Application/Resources/Images/CommonImages.xcassets/Images/skip_to_live.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "skip_to_live.pdf",
+      "idiom" : "iphone"
+    },
+    {
+      "filename" : "skip_to_live-1.pdf",
+      "idiom" : "ipad"
+    },
+    {
+      "filename" : "skip_to_live-2.pdf",
+      "idiom" : "car"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Application/Resources/Images/CommonImages.xcassets/Images/start_over.imageset/Contents.json

@@ -7,6 +7,10 @@
     {
       "filename" : "start_over-1.pdf",
       "idiom" : "ipad"
+    },
+    {
+      "filename" : "start_over-2.pdf",
+      "idiom" : "car"
     }
   ],
   "info" : {

Application/Resources/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt

@@ -105,7 +105,7 @@ version: 2.0.1
 
 name: abseil-cpp-SwiftPM, nameSpecified: abseil-cpp-swiftpm, owner: firebase, version: 0.20220203.2, source: https://github.com/firebase/abseil-cpp-SwiftPM
 
-name: Aiolos, nameSpecified: aiolos, owner: IdeasOnCanvas, version: 1.8.1, source: https://github.com/IdeasOnCanvas/Aiolos
+name: Aiolos, nameSpecified: aiolos, owner: IdeasOnCanvas, version: 1.9.2, source: https://github.com/IdeasOnCanvas/Aiolos
 
 name: appcenter-sdk-apple, nameSpecified: appcenter-sdk-apple, owner: microsoft, version: 4.4.3, source: https://github.com/microsoft/appcenter-sdk-apple
 
@@ -115,7 +115,7 @@ name: Comscore-Swift-Package-Manager, nameSpecified: comscore-swift-package-mana
 
 name: DZNEmptyDataSet, nameSpecified: dznemptydataset, owner: dzenbot, version: , source: https://github.com/dzenbot/DZNEmptyDataSet
 
-name: firebase-ios-sdk, nameSpecified: firebase-ios-sdk, owner: firebase, version: 9.3.0, source: https://github.com/firebase/firebase-ios-sdk
+name: firebase-ios-sdk, nameSpecified: firebase-ios-sdk, owner: firebase, version: 9.5.0, source: https://github.com/firebase/firebase-ios-sdk
 
 name: FSCalendar, nameSpecified: fscalendar, owner: WenchaoD, version: 2.8.4, source: https://github.com/WenchaoD/FSCalendar
 
@@ -135,7 +135,7 @@ name: grpc-ios, nameSpecified: grpc-ios, owner: grpc, version: 1.44.3-grpc, sour
 
 name: gtm-session-fetcher, nameSpecified: gtm-session-fetcher, owner: google, version: 2.0.0, source: https://github.com/google/gtm-session-fetcher
 
-name: ios-library, nameSpecified: ios-library, owner: urbanairship, version: 16.8.0, source: https://github.com/urbanairship/ios-library
+name: ios-library, nameSpecified: ios-library, owner: urbanairship, version: 16.9.3, source: https://github.com/urbanairship/ios-library
 
 name: leveldb, nameSpecified: leveldb, owner: firebase, version: 1.22.2, source: https://github.com/firebase/leveldb
 
@@ -169,7 +169,7 @@ name: srgdiagnostics-apple, nameSpecified: srgdiagnostics-apple, owner: SRGSSR,
 
 name: srgidentity-apple, nameSpecified: srgidentity-apple, owner: SRGSSR, version: 3.3.0, source: https://github.com/SRGSSR/srgidentity-apple
 
-name: srgletterbox-apple, nameSpecified: srgletterbox-apple, owner: SRGSSR, version: 8.3.0, source: https://github.com/SRGSSR/srgletterbox-apple
+name: srgletterbox-apple, nameSpecified: srgletterbox-apple, owner: SRGSSR, version: 8.3.1, source: https://github.com/SRGSSR/srgletterbox-apple
 
 name: srglogger-apple, nameSpecified: srglogger-apple, owner: SRGSSR, version: 3.1.0, source: https://github.com/SRGSSR/srglogger-apple
 
@@ -179,9 +179,9 @@ name: srgnetwork-apple, nameSpecified: srgnetwork-apple, owner: SRGSSR, version:
 
 name: srguserdata-apple, nameSpecified: srguserdata-apple, owner: SRGSSR, version: 3.3.0, source: https://github.com/SRGSSR/srguserdata-apple
 
-name: swift-collections, nameSpecified: swift-collections, owner: apple, version: 1.0.2, source: https://github.com/apple/swift-collections
+name: swift-collections, nameSpecified: swift-collections, owner: apple, version: 1.0.3, source: https://github.com/apple/swift-collections
 
-name: swift-protobuf, nameSpecified: swift-protobuf, owner: apple, version: 1.19.0, source: https://github.com/apple/swift-protobuf
+name: swift-protobuf, nameSpecified: swift-protobuf, owner: apple, version: 1.20.1, source: https://github.com/apple/swift-protobuf
 
 name: SwiftMessages, nameSpecified: swiftmessages, owner: SwiftKickMobile, version: 9.0.6, source: https://github.com/SwiftKickMobile/SwiftMessages
 

Application/Resources/Settings.bundle/com.mono0926.LicensePlist.plist

@@ -22,7 +22,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/Aiolos</string>
 			<key>Title</key>
-			<string>aiolos (1.8.1)</string>
+			<string>aiolos (1.9.2)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -70,7 +70,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/firebase-ios-sdk</string>
 			<key>Title</key>
-			<string>firebase-ios-sdk (9.3.0)</string>
+			<string>firebase-ios-sdk (9.5.0)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -150,7 +150,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/ios-library</string>
 			<key>Title</key>
-			<string>ios-library (16.8.0)</string>
+			<string>ios-library (16.9.3)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -310,7 +310,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/srgletterbox-apple</string>
 			<key>Title</key>
-			<string>srgletterbox-apple (8.3.0)</string>
+			<string>srgletterbox-apple (8.3.1)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -350,15 +350,15 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/swift-collections</string>
 			<key>Title</key>
-			<string>swift-collections (1.0.2)</string>
+			<string>swift-collections (1.0.3)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
 		<dict>
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/swift-protobuf</string>
 			<key>Title</key>
-			<string>swift-protobuf (1.19.0)</string>
+			<string>swift-protobuf (1.20.1)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>

Application/Sources/Application/AppDelegate.m

@@ -51,6 +51,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     NSAssert(NSClassFromString(@"ASIdentifierManager") == Nil, @"No implicit AdSupport.framework dependency must be found");
 
     [AVAudioSession.sharedInstance setCategory:AVAudioSessionCategoryPlayback error:NULL];
+    [RemoteCommandCenter activateRatingCommand];
 
     PlayApplicationRunOnce(^(void (^completionHandler)(BOOL success)) {
         [PlayFirebaseConfiguration clearFirebaseConfigurationCache];
@@ -129,6 +130,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     // Clean downloaded folder
     [Download removeUnusedDownloadedFiles];
 
+    PlayApplicationRunOnce(^(void (^completionHandler)(BOOL success)) {
+        [Download updateUnplayableDownloads];
+        completionHandler(YES);
+    }, @"updateUnplayableDownloads");
+
     [self checkForForcedUpdates];
 
     __block BOOL firstLaunchDone = YES;

Application/Sources/Application/Navigation.swift

@@ -42,7 +42,7 @@ extension UIViewController {
 
             controller.publisher(for: \.continuousPlaybackUpcomingMedia)
                 .sink { upcomingMedia in
-                    guard let upcomingMedia = upcomingMedia else { return }
+                    guard let upcomingMedia else { return }
 
                     let labels = SRGAnalyticsHiddenEventLabels()
                     labels.source = AnalyticsSource.automatic.rawValue
@@ -60,7 +60,7 @@ extension UIViewController {
             controller.playMedia(media, at: position, withPreferredSettings: nil)
             present(letterboxViewController, animated: animated) {
                 SRGAnalyticsTracker.shared.trackPageView(withTitle: AnalyticsPageTitle.player.rawValue, levels: [AnalyticsPageLevel.play.rawValue])
-                if let completion = completion {
+                if let completion {
                     completion()
                 }
             }
@@ -174,7 +174,7 @@ extension UIViewController {
                         Banner.showError(error)
                     }
                 } receiveValue: { [weak self] media in
-                    guard let self = self else { return }
+                    guard let self else { return }
                     self.play_presentMediaPlayer(with: media, position: nil, airPlaySuggestions: true, fromPushNotification: false, animated: animated) { _ in
                         let labels = SRGAnalyticsHiddenEventLabels()
                         labels.source = notification.showURN ?? AnalyticsSource.notification.rawValue
@@ -233,11 +233,11 @@ extension UIViewController {
         case let .media(media):
             play_presentMediaPlayer(with: media, position: nil, airPlaySuggestions: true, fromPushNotification: false, animated: animated, completion: nil)
         case let .show(show):
-            guard let navigationController = navigationController else { return }
+            guard let navigationController else { return }
             let showViewController = SectionViewController.showViewController(for: show)
             navigationController.pushViewController(showViewController, animated: animated)
         case let .topic(topic):
-            guard let navigationController = navigationController else { return }
+            guard let navigationController else { return }
             let pageViewController = PageViewController(id: .topic(topic))
             navigationController.pushViewController(pageViewController, animated: animated)
         case let .download(download):

Application/Sources/Bridges/PlaySRG-ObjectiveC.h

@@ -31,6 +31,7 @@
 #import "PlayApplicationNavigation.h"
 #import "PlayDurationFormatter.h"
 #import "PlayErrors.h"
+#import "Playlist.h"
 #import "PushService.h"
 #import "Reachability.h"
 #import "RefreshControl.h"
@@ -42,6 +43,7 @@
 #import "SRGDay+PlaySRG.h"
 #import "SRGLetterboxController+PlaySRG.h"
 #import "SRGMedia+PlaySRG.h"
+#import "SRGMediaComposition+PlaySRG.h"
 #import "SRGProgram+PlaySRG.h"
 #import "SRGProgramComposition+PlaySRG.h"
 #import "UIColor+PlaySRG.h"

Application/Sources/Bridges/SwiftMessagesBridge.swift

@@ -58,7 +58,7 @@ final class SwiftMessagesBridge: NSObject {
             presentationController = presentationController?.parent
         }
 
-        if let presentationController = presentationController {
+        if let presentationController {
             config.presentationContext = .viewController(presentationController)
         }
 

Application/Sources/CarPlay/CarPlay+Extensions.swift

@@ -23,14 +23,22 @@ extension CPListTemplate {
 extension CPInterfaceController {
     func play(media: SRGMedia, completion: @escaping () -> Void) {
         if let controller = SRGLetterboxService.shared.controller {
-            controller.playMedia(media, at: HistoryResumePlaybackPositionForMedia(media), withPreferredSettings: ApplicationSettingPlaybackSettings())
+            if controller.play_mainMedia != media {
+                controller.playMedia(media, at: HistoryResumePlaybackPositionForMedia(media), withPreferredSettings: ApplicationSettingPlaybackSettings())
+            }
         }
         else {
             let controller = SRGLetterboxController()
             controller.playMedia(media, at: HistoryResumePlaybackPositionForMedia(media), withPreferredSettings: ApplicationSettingPlaybackSettings())
             SRGLetterboxService.shared.enable(with: controller, pictureInPictureDelegate: nil)
         }
 
+        if let controller = SRGLetterboxService.shared.controller {
+            let playlist = PlaylistForURN(media.urn)
+            controller.playlistDataSource = playlist
+            controller.playbackTransitionDelegate = playlist
+        }
+
         let nowPlayingTemplate = CPNowPlayingTemplate.shared
         pushTemplate(nowPlayingTemplate, animated: true) { _, _ in
             completion()