Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FXIOS-11168 [Content Sharing Opt] Telemetry to track start up time for deeplinks (backport #24422) #24483

Open
wants to merge 1 commit into
base: release/v135
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions firefox-ios/Client.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
0AFF7F682C78989000265214 /* CertificatesHeaderItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AFF7F672C78989000265214 /* CertificatesHeaderItem.swift */; };
0AFF7F6C2C7C7BBA00265214 /* CertificatesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AFF7F692C7C7BB800265214 /* CertificatesCell.swift */; };
0AFF7F6D2C7C7BBA00265214 /* CertificatesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AFF7F6A2C7C7BB900265214 /* CertificatesViewController.swift */; };
0B11AF022CB412D100AD51D5 /* Metrics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B11AF002CB412D100AD51D5 /* Metrics.swift */; };
0B11AF042CB4130F00AD51D5 /* Metrics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B11AF032CB4130F00AD51D5 /* Metrics.swift */; };
0B1C58D12CE5019A00F498F0 /* UserAgentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B1C58D02CE5019A00F498F0 /* UserAgentTests.swift */; };
0B305E1B1E3A98A900BE0767 /* BookmarksTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B305E1A1E3A98A900BE0767 /* BookmarksTests.swift */; };
Expand Down Expand Up @@ -64,6 +63,7 @@
0BB5B30B1AC0AD1F0052877D /* LoginsHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BB5B30A1AC0AD1F0052877D /* LoginsHelper.swift */; };
0BBAC4BC2CDD44EC0072DB61 /* easterEggGif.gif in Resources */ = {isa = PBXBuildFile; fileRef = 0BBAC4BB2CDD44EC0072DB61 /* easterEggGif.gif */; };
0BBC50952CA1F7F900CB7248 /* BookmarksRefactorFeatureFlagProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BBC50942CA1F7F900CB7248 /* BookmarksRefactorFeatureFlagProvider.swift */; };
0BC57FE92D48E9CF0049C2B9 /* Metrics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC57FE82D48E9CF0049C2B9 /* Metrics.swift */; };
0BC9C9C41F26F54D000E8AB5 /* SiteLoadTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC9C9C31F26F54D000E8AB5 /* SiteLoadTest.swift */; };
0BCC26902CFF0CD70072CD5A /* KeychainWrapperExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BCC268F2CFF0CD70072CD5A /* KeychainWrapperExtensions.swift */; };
0BCC26922CFF10250072CD5A /* Shared in Frameworks */ = {isa = PBXBuildFile; productRef = 0BCC26912CFF10250072CD5A /* Shared */; };
Expand Down Expand Up @@ -1884,7 +1884,6 @@
EDD2A7FA2CDBD1D100ED464C /* SearchEngineElement+initFromSearchEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDD2A7F92CDBD1D000ED464C /* SearchEngineElement+initFromSearchEngine.swift */; };
EDD3348E2D109458004516D0 /* ShareTelemetryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDD3348D2D109458004516D0 /* ShareTelemetryTests.swift */; };
EDD334902D109A5B004516D0 /* ShareTelemetryActivityItemProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDD3348F2D109A5B004516D0 /* ShareTelemetryActivityItemProviderTests.swift */; };
EDD334932D109AE6004516D0 /* MockShareTelemetry.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDD334922D109AE6004516D0 /* MockShareTelemetry.swift */; };
EDD334952D10BEEB004516D0 /* UserDefaults+valueExists.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDD334942D10BEEB004516D0 /* UserDefaults+valueExists.swift */; };
EDDF340A2CDD159F008BB6A4 /* SearchEngineModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDDF34092CDD159F008BB6A4 /* SearchEngineModel.swift */; };
EDDF340B2CDD1B7C008BB6A4 /* SearchEngineModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDDF34092CDD159F008BB6A4 /* SearchEngineModel.swift */; };
Expand Down Expand Up @@ -2333,7 +2332,6 @@
0AFF7F672C78989000265214 /* CertificatesHeaderItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CertificatesHeaderItem.swift; sourceTree = "<group>"; };
0AFF7F692C7C7BB800265214 /* CertificatesCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CertificatesCell.swift; sourceTree = "<group>"; };
0AFF7F6A2C7C7BB900265214 /* CertificatesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CertificatesViewController.swift; sourceTree = "<group>"; };
0B11AF002CB412D100AD51D5 /* Metrics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metrics.swift; sourceTree = "<group>"; };
0B11AF032CB4130F00AD51D5 /* Metrics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metrics.swift; sourceTree = "<group>"; };
0B1C58D02CE5019A00F498F0 /* UserAgentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAgentTests.swift; sourceTree = "<group>"; };
0B305E1A1E3A98A900BE0767 /* BookmarksTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2369,6 +2367,7 @@
0BBC50942CA1F7F900CB7248 /* BookmarksRefactorFeatureFlagProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksRefactorFeatureFlagProvider.swift; sourceTree = "<group>"; };
0BBD4108861715F8A60D6225 /* hi-IN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hi-IN"; path = "hi-IN.lproj/Intro.strings"; sourceTree = "<group>"; };
0BBD47CD96940FB07733C725 /* ne-NP */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ne-NP"; path = "ne-NP.lproj/ErrorPages.strings"; sourceTree = "<group>"; };
0BC57FE82D48E9CF0049C2B9 /* Metrics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Metrics.swift; sourceTree = "<group>"; };
0BC9C9C31F26F54D000E8AB5 /* SiteLoadTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteLoadTest.swift; sourceTree = "<group>"; };
0BCC268F2CFF0CD70072CD5A /* KeychainWrapperExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainWrapperExtensions.swift; sourceTree = "<group>"; };
0BD24470A8F71A8CE50A55E0 /* ur */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ur; path = ur.lproj/InfoPlist.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -9664,7 +9663,6 @@
EDD2A7F92CDBD1D000ED464C /* SearchEngineElement+initFromSearchEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchEngineElement+initFromSearchEngine.swift"; sourceTree = "<group>"; };
EDD3348D2D109458004516D0 /* ShareTelemetryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareTelemetryTests.swift; sourceTree = "<group>"; };
EDD3348F2D109A5B004516D0 /* ShareTelemetryActivityItemProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareTelemetryActivityItemProviderTests.swift; sourceTree = "<group>"; };
EDD334922D109AE6004516D0 /* MockShareTelemetry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockShareTelemetry.swift; sourceTree = "<group>"; };
EDD334942D10BEEB004516D0 /* UserDefaults+valueExists.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+valueExists.swift"; sourceTree = "<group>"; };
EDDF34092CDD159F008BB6A4 /* SearchEngineModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchEngineModel.swift; sourceTree = "<group>"; };
EDEE4CC7BD65892525632A4E /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Today.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -10110,7 +10108,7 @@
0B11AF062CB416FE00AD51D5 /* Metrics */ = {
isa = PBXGroup;
children = (
0B11AF002CB412D100AD51D5 /* Metrics.swift */,
0BC57FE82D48E9CF0049C2B9 /* Metrics.swift */,
);
path = Metrics;
sourceTree = "<group>";
Expand Down Expand Up @@ -14218,7 +14216,6 @@
EDD3348C2D109416004516D0 /* Sharing */ = {
isa = PBXGroup;
children = (
EDD334912D109ADB004516D0 /* Mocks */,
ED4294842CF1286E0077D7CB /* ShareManagerTests.swift */,
EDD3348F2D109A5B004516D0 /* ShareTelemetryActivityItemProviderTests.swift */,
EDD3348D2D109458004516D0 /* ShareTelemetryTests.swift */,
Expand All @@ -14229,14 +14226,6 @@
path = Sharing;
sourceTree = "<group>";
};
EDD334912D109ADB004516D0 /* Mocks */ = {
isa = PBXGroup;
children = (
EDD334922D109AE6004516D0 /* MockShareTelemetry.swift */,
);
path = Mocks;
sourceTree = "<group>";
};
F8324A082649A188007E4BFA /* CredentialProvider */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -16707,6 +16696,7 @@
8A19ACAB2A32895E001C2147 /* BrowserNavigationHandler.swift in Sources */,
8AE80BB82891BE0700BC12EA /* JumpBackInDataAdaptor.swift in Sources */,
8A01891C275E9C2A00923EFE /* ClearHistorySheetProvider.swift in Sources */,
0BC57FE92D48E9CF0049C2B9 /* Metrics.swift in Sources */,
8A4EA0DD2C0117F200E4E4F1 /* MicrosurveyModel.swift in Sources */,
8C44A9D22A6A99FE009A1AA7 /* ShoppingProduct.swift in Sources */,
63F7A9AA2C7529ED005846F5 /* NativeErrorPageModel.swift in Sources */,
Expand Down Expand Up @@ -16910,7 +16900,6 @@
81122E212B221AC0003DD9F8 /* SearchScreenState.swift in Sources */,
8A4490952BF3C42B00E7E682 /* MicrosurveyConfirmationView.swift in Sources */,
1DA6F6512B48B42900BB5AD6 /* WindowEventCoordinator.swift in Sources */,
0B11AF022CB412D100AD51D5 /* Metrics.swift in Sources */,
C4E3984C1D21F2FD004E89BA /* TabTrayButtonExtensions.swift in Sources */,
ED07C0E62CCACD7E006C0627 /* Locale+possibilitiesForLanguageIdentifier.swift in Sources */,
437A857827E43FE100E42764 /* FxAWebViewTelemetry.swift in Sources */,
Expand Down Expand Up @@ -17473,7 +17462,6 @@
C2D80BED2AAF3C6B00CDF7A9 /* MockBrowserCoordinator.swift in Sources */,
45D5EDC0292D619000311934 /* MockablePinnedSites.swift in Sources */,
5AE371852A4DD6FE0092A760 /* PasswordManagerCoordinatorDelegateMock.swift in Sources */,
EDD334932D109AE6004516D0 /* MockShareTelemetry.swift in Sources */,
1D558A5B2BEE7D07001EF527 /* WindowSimpleTabsCoordinator.swift in Sources */,
8A6E8DEB2B275BA9000C4301 /* PrivateHomepageViewControllerTests.swift in Sources */,
8A93F86529D37331004159D9 /* DefaultRouterTests.swift in Sources */,
Expand Down
24 changes: 24 additions & 0 deletions firefox-ios/Client/Application/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
lazy var backgroundTabLoader: BackgroundTabLoader = {
return DefaultBackgroundTabLoader(tabQueue: (AppContainer.shared.resolve() as Profile).queue)
}()
<<<<<<< HEAD
=======
lazy var shareTelemetry = ShareTelemetry()
lazy var gleanUsageReportingMetricsService = GleanUsageReportingMetricsService(profile: profile)
>>>>>>> d17d22be9 (Add FXIOS-11168 [Content Sharing Opt] Telemetry to track start up time for deeplinks (#24422))
private var isLoadingBackgroundTabs = false

private var shutdownWebServer: DispatchSourceTimer?
Expand All @@ -53,6 +58,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
willFinishLaunchingWithOptions
launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
startRecordingStartupOpenURLTime()
// Configure app information for BrowserKit, needed for logger
BrowserKitInformation.shared.configure(buildChannel: AppConstants.buildChannel,
nightlyAppVersion: AppConstants.nightlyAppVersion,
Expand Down Expand Up @@ -98,6 +104,24 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return true
}

private func startRecordingStartupOpenURLTime() {
shareTelemetry.recordOpenURLTime()
var recordCompleteToken: ActionToken?
var recordCancelledToken: ActionToken?
recordCompleteToken = AppEventQueue.wait(for: .recordStartupTimeOpenURLComplete) { [weak self] in
self?.shareTelemetry.sendOpenURLTimeRecord()
guard let recordCancelledToken, let recordCompleteToken else { return }
AppEventQueue.cancelAction(token: recordCancelledToken)
AppEventQueue.cancelAction(token: recordCompleteToken)
}
recordCancelledToken = AppEventQueue.wait(for: .recordStartupTimeOpenURLCancelled) { [weak self] in
self?.shareTelemetry.cancelOpenURLTimeRecord()
guard let recordCancelledToken, let recordCompleteToken else { return }
AppEventQueue.cancelAction(token: recordCancelledToken)
AppEventQueue.cancelAction(token: recordCompleteToken)
}
}

func application(
_ application: UIApplication,
didFinishLaunchingWithOptions
Expand Down
7 changes: 7 additions & 0 deletions firefox-ios/Client/Application/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
options connectionOptions: UIScene.ConnectionOptions
) {
guard !AppConstants.isRunningUnitTest else { return }
cancelStartupTimeRecordIfNeeded(options: connectionOptions)
logger.log("SceneDelegate: will connect to session", level: .info, category: .lifecycle)

// Add hooks for the nimbus-cli to test experiments on device or involving deeplinks.
Expand All @@ -55,6 +56,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
handle(connectionOptions: connectionOptions)
}

private func cancelStartupTimeRecordIfNeeded(options: UIScene.ConnectionOptions) {
// if the conditions are met it means the app was launched with no deeplink options
guard options.urlContexts.isEmpty, options.shortcutItem == nil, options.userActivities.isEmpty else { return }
AppEventQueue.signal(event: .recordStartupTimeOpenURLCancelled)
}

func sceneDidDisconnect(_ scene: UIScene) {
let logUUID = sceneCoordinator?.windowUUID.uuidString ?? "<nil>"
logger.log("SceneDelegate: scene did disconnect. UUID: \(logUUID)", level: .info, category: .lifecycle)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,8 @@ class BrowserCoordinator: BaseCoordinator,
}
}

// MARK: - Handle Deeplink Open URL / text

private func handle(query: String, isPrivate: Bool) {
browserViewController.handle(query: query, isPrivate: isPrivate)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2555,31 +2555,40 @@ class BrowserViewController: UIViewController,
topTabsVisible: UIDevice.current.userInterfaceIdiom == .pad)
}

// MARK: - Handle Deeplink open URL / query

func handle(query: String, isPrivate: Bool) {
openBlankNewTab(focusLocationField: false, isPrivate: isPrivate)
if isToolbarRefactorEnabled {
openBrowser(searchTerm: query)
} else if let legacyUrlBar {
urlBar(legacyUrlBar, didSubmitText: query)
}
AppEventQueue.signal(event: .recordStartupTimeOpenURLComplete)
}

func handle(url: URL?, isPrivate: Bool, options: Set<Route.SearchOptions>? = nil) {
if let url = url {
switchToTabForURLOrOpen(url, isPrivate: isPrivate)
switchToTabForURLOrOpen(url, isPrivate: isPrivate) {
AppEventQueue.signal(event: .recordStartupTimeOpenURLComplete)
}
} else {
openBlankNewTab(
focusLocationField: options?.contains(.focusLocationField) == true,
isPrivate: isPrivate
)
AppEventQueue.signal(event: .recordStartupTimeOpenURLComplete)
}
}

func handle(url: URL?, tabId: String, isPrivate: Bool = false) {
if let url = url {
switchToTabForURLOrOpen(url, uuid: tabId, isPrivate: isPrivate)
switchToTabForURLOrOpen(url, uuid: tabId, isPrivate: isPrivate) {
AppEventQueue.signal(event: .recordStartupTimeOpenURLComplete)
}
} else {
openBlankNewTab(focusLocationField: true, isPrivate: isPrivate)
AppEventQueue.signal(event: .recordStartupTimeOpenURLComplete)
}
}

Expand All @@ -2600,10 +2609,33 @@ class BrowserViewController: UIViewController,
topTabsViewController?.applyUIMode(isPrivate: isPrivate, theme: currentTheme())
}

<<<<<<< HEAD
func switchToTabForURLOrOpen(_ url: URL, uuid: String? = nil, isPrivate: Bool = false) {
=======
func switchToTabForURLOrOpen(
_ url: URL,
uuid: String? = nil,
isPrivate: Bool = false,
completionHandler: (() -> Void)? = nil
) {
// Avoid race condition; if we're restoring tabs, wait to process URL until completed. [FXIOS-10916]
guard !tabManager.isRestoringTabs else {
AppEventQueue.wait(for: .tabRestoration(tabManager.windowUUID)) { [weak self] in
self?.switchToTabForURLOrOpen(
url,
uuid: uuid,
isPrivate: isPrivate,
completionHandler: completionHandler
)
}
return
}

>>>>>>> d17d22be9 (Add FXIOS-11168 [Content Sharing Opt] Telemetry to track start up time for deeplinks (#24422))
popToBVC()
guard !isShowingJSPromptAlert() else {
tabManager.addTab(URLRequest(url: url), isPrivate: isPrivate)
completionHandler?()
return
}

Expand All @@ -2614,6 +2646,7 @@ class BrowserViewController: UIViewController,
} else {
openURLInNewTab(url, isPrivate: isPrivate)
}
completionHandler?()
}

@discardableResult
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ public enum AppEvent: AppEventType {
case accountManagerInitialized
case browserIsReady

// Events: Open URL startup time record
case recordStartupTimeOpenURLComplete
case recordStartupTimeOpenURLCancelled

// Activities: Profile Syncing
case profileSyncing

Expand Down
36 changes: 25 additions & 11 deletions firefox-ios/Client/Frontend/Share/ShareTelemetry.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@
import Foundation
import Glean

protocol ShareTelemetry {
func sharedTo(
activityType: UIActivity.ActivityType?,
shareType: ShareType,
hasShareMessage: Bool,
isEnrolledInSentFromFirefox: Bool,
isOptedInSentFromFirefox: Bool
)
}
class ShareTelemetry {
private let gleanWrapper: GleanWrapper
private var openURLTimerId: TimerId?

init(gleanWrapper: GleanWrapper = DefaultGleanWrapper()) {
self.gleanWrapper = gleanWrapper
}

struct DefaultShareTelemetry: ShareTelemetry {
func sharedTo(
activityType: UIActivity.ActivityType?,
shareType: ShareType,
Expand All @@ -30,6 +27,23 @@ struct DefaultShareTelemetry: ShareTelemetry {
isOptedInSentFromFirefox: isOptedInSentFromFirefox,
shareType: shareType.typeName
)
GleanMetrics.ShareSheet.sharedTo.record(extra)
gleanWrapper.recordEvent(for: GleanMetrics.ShareSheet.sharedTo, extras: extra)
}

// MARK: - Deeplinks

func recordOpenURLTime() {
openURLTimerId = gleanWrapper.startTiming(for: GleanMetrics.Share.deeplinkOpenUrlStartupTime)
}

func sendOpenURLTimeRecord() {
guard let openURLTimerId else { return }
gleanWrapper.stopAndAccumulateTiming(for: GleanMetrics.Share.deeplinkOpenUrlStartupTime,
timerId: openURLTimerId)
}

func cancelOpenURLTimeRecord() {
guard let openURLTimerId else { return }
gleanWrapper.cancelTiming(for: GleanMetrics.Share.deeplinkOpenUrlStartupTime, timerId: openURLTimerId)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ class ShareTelemetryActivityItemProvider: UIActivityItemProvider, @unchecked Sen
init(
shareType: ShareType,
shareMessage: ShareMessage?,
telemetry: ShareTelemetry = DefaultShareTelemetry()
gleanWrapper: GleanWrapper = DefaultGleanWrapper()
) {
self.shareType = shareType
self.shareMessage = shareMessage
self.telemetry = telemetry
self.telemetry = ShareTelemetry(gleanWrapper: gleanWrapper)

super.init(placeholderItem: NSNull())
}
Expand Down
Loading