Fix crash in Widget because TelemetryManager wasn't initialized

conath · conath · commit 5ed338862438 · 2020-12-18T15:55:02.000+01:00
Delay playing trailer from Widget when the app cold starts
Add Telemetry signal when a widget is tapped
Update Version to 1.1.2 and build to 34
diff --git a/TheatricalMovieTrailers.xcodeproj/project.pbxproj b/TheatricalMovieTrailers.xcodeproj/project.pbxproj
@@ -58,6 +58,7 @@
 		83B53B3D258A78A3003ACD7D /* TelemetryClient in Frameworks */ = {isa = PBXBuildFile; productRef = 83B53B3C258A78A3003ACD7D /* TelemetryClient */; };
 		83BAC28E2538CC56004D59BC /* FramedImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83BAC28D2538CC56004D59BC /* FramedImage.swift */; };
 		83BD3612254363A300C4588E /* UIResponder+currentResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83BD3611254363A300C4588E /* UIResponder+currentResponder.swift */; };
+		83C814C6258CF4150028C6D6 /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8300055C2541B34A0069A8D1 /* Secrets.swift */; };
 		83CBE5122537600F00E22FAE /* CoverFlowListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83CBE5112537600F00E22FAE /* CoverFlowListView.swift */; };
 		83D21174253F9CDD00EF54A3 /* SortingMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83D21173253F9CDD00EF54A3 /* SortingMode.swift */; };
 		83D2117825405FC900EF54A3 /* InlineTrailerPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83D2117725405FC900EF54A3 /* InlineTrailerPlayerView.swift */; };
@@ -460,6 +461,7 @@
 				8383E904254C60EC00F44F5E /* FramedImage.swift in Sources */,
 				831F1B6D25499412008D24D4 /* TrailersWidget.swift in Sources */,
 				831F1B892549BC86008D24D4 /* AppError.swift in Sources */,
+				83C814C6258CF4150028C6D6 /* Secrets.swift in Sources */,
 				8387DA7B254CC6520014B669 /* MoviePosterView.swift in Sources */,
 				8387DA6E254CBD720014B669 /* MoviePosterWithTitle.swift in Sources */,
 				8387DA78254CC3780014B669 /* LargeMoviePosterWithTitle.swift in Sources */,
@@ -614,7 +616,7 @@
 				CODE_SIGN_ENTITLEMENTS = TheatricalMovieTrailers/TheatricalMovieTrailers.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_ASSET_PATHS = "\"TheatricalMovieTrailers/Preview Content\"";
 				DEVELOPMENT_TEAM = U96PJYMZWW;
 				ENABLE_PREVIEWS = YES;
@@ -624,7 +626,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = cafe.chrisp.tmt;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -642,7 +644,7 @@
 				CODE_SIGN_ENTITLEMENTS = TheatricalMovieTrailers/TheatricalMovieTrailers.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_ASSET_PATHS = "\"TheatricalMovieTrailers/Preview Content\"";
 				DEVELOPMENT_TEAM = U96PJYMZWW;
 				ENABLE_PREVIEWS = YES;
@@ -652,7 +654,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = cafe.chrisp.tmt;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -669,7 +671,7 @@
 				CODE_SIGN_ENTITLEMENTS = TrailersWidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_TEAM = U96PJYMZWW;
 				INFOPLIST_FILE = TrailersWidget/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -678,7 +680,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = cafe.chrisp.tmt.TrailersWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -695,7 +697,7 @@
 				CODE_SIGN_ENTITLEMENTS = TrailersWidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_TEAM = U96PJYMZWW;
 				INFOPLIST_FILE = TrailersWidget/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -704,7 +706,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = cafe.chrisp.tmt.TrailersWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
diff --git a/TheatricalMovieTrailers/SceneDelegate.swift b/TheatricalMovieTrailers/SceneDelegate.swift
@@ -30,7 +30,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
                 assertionFailure("Malformed id URL parameter: expected integer")
                 return
             }
-            viewParameters.showTrailerID = Int(id)
+            /// App needs a bit to catch up
+            DispatchQueue.main.asyncAfter(0.5) { [self] in
+                viewParameters.showTrailerID = Int(id)
+            }
         }
 
         // Use a UIHostingController as window root view controller.
diff --git a/TheatricalMovieTrailers/Views/CoverFlowScrollView.swift b/TheatricalMovieTrailers/Views/CoverFlowScrollView.swift
@@ -7,6 +7,7 @@
 
 import AVKit
 import SwiftUI
+import TelemetryClient
 
 struct CoverFlowScrollView: View {
     private let scrollAnchor = UnitPoint(x: 0.5, y: 1.0)
@@ -80,6 +81,7 @@ struct CoverFlowScrollView: View {
                                             }
                                         }
                                     }
+                                    // Widget tapped => show trailer by id
                                     .onChange(of: viewParameters.showTrailerID ?? -1) { _ in
                                         handleShowTrailer(viewParameters.showTrailerID, reader)
                                     }
@@ -255,6 +257,9 @@ struct CoverFlowScrollView: View {
                         self.centeredItem = info
                         playTrailer(info)
                     }
+                    // send telemetry
+                    let data = ["trailerID":"\(info.id)", "movieTitle":info.title]
+                    TelemetryManager.send("widgetTapped", with: data)
                 }
             }
         }
diff --git a/TrailersWidget/TrailersWidget.swift b/TrailersWidget/TrailersWidget.swift
@@ -136,6 +136,8 @@ struct TrailersWidgetEntryView : View {
     }
     
     private func sendTelemetry() {
+        let configuration = TelemetryManagerConfiguration(appID: TelemetryAppId)
+        TelemetryManager.initialize(with: configuration)
         var trailerScopeString: String
         switch entry.configuration.trailerScope {
         case .releasingSoonest :

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {`
`30`	`30`	`assertionFailure("Malformed id URL parameter: expected integer")`
`31`	`31`	`return`
`32`	`32`	`}`
`33`		`- viewParameters.showTrailerID = Int(id)`
	`33`	`+ /// App needs a bit to catch up`
	`34`	`+ DispatchQueue.main.asyncAfter(0.5) { [self] in`
	`35`	`+ viewParameters.showTrailerID = Int(id)`
	`36`	`+ }`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`// Use a UIHostingController as window root view controller.`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`import AVKit`
`9`	`9`	`import SwiftUI`
	`10`	`+import TelemetryClient`
`10`	`11`
`11`	`12`	`struct CoverFlowScrollView: View {`
`12`	`13`	`private let scrollAnchor = UnitPoint(x: 0.5, y: 1.0)`
`@@ -80,6 +81,7 @@ struct CoverFlowScrollView: View {`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`	`}`
	`84`	`+ // Widget tapped => show trailer by id`
`83`	`85`	`.onChange(of: viewParameters.showTrailerID ?? -1) { _ in`
`84`	`86`	`handleShowTrailer(viewParameters.showTrailerID, reader)`
`85`	`87`	`}`
`@@ -255,6 +257,9 @@ struct CoverFlowScrollView: View {`
`255`	`257`	`self.centeredItem = info`
`256`	`258`	`playTrailer(info)`
`257`	`259`	`}`
	`260`	`+ // send telemetry`
	`261`	`+ let data = ["trailerID":"\(info.id)", "movieTitle":info.title]`
	`262`	`+ TelemetryManager.send("widgetTapped", with: data)`
`258`	`263`	`}`
`259`	`264`	`}`
`260`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,8 @@ struct TrailersWidgetEntryView : View {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`private func sendTelemetry() {`
	`139`	`+ let configuration = TelemetryManagerConfiguration(appID: TelemetryAppId)`
	`140`	`+ TelemetryManager.initialize(with: configuration)`
`139`	`141`	`var trailerScopeString: String`
`140`	`142`	`switch entry.configuration.trailerScope {`
`141`	`143`	`case .releasingSoonest :`