Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access

# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
This commit is contained in:
Doug
2021-10-08 11:45:43 +01:00
107 changed files with 2783 additions and 224 deletions
@@ -98,10 +98,18 @@ extension ServiceTermsModalCoordinatorBridgePresenter: ServiceTermsModalCoordina
func serviceTermsModalCoordinatorDidAccept(_ coordinator: ServiceTermsModalCoordinatorType) {
self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidAccept(self)
if serviceType == MXServiceTypeIdentityService {
Analytics.sharedInstance().trackValue(1, category: kMXKAnalyticsContactsCategory, name: AnalyticsContactsIdentityServerAccepted)
}
}
func serviceTermsModalCoordinatorDidDecline(_ coordinator: ServiceTermsModalCoordinatorType) {
self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidDecline(self, session: self.session)
if serviceType == MXServiceTypeIdentityService {
Analytics.sharedInstance().trackValue(0, category: kMXKAnalyticsContactsCategory, name: AnalyticsContactsIdentityServerAccepted)
}
}
}
@@ -109,5 +117,9 @@ extension ServiceTermsModalCoordinatorBridgePresenter: ServiceTermsModalCoordina
extension ServiceTermsModalCoordinatorBridgePresenter: UIAdaptivePresentationControllerDelegate {
func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
self.delegate?.serviceTermsModalCoordinatorBridgePresenterDelegateDidClose(self)
if serviceType == MXServiceTypeIdentityService {
Analytics.sharedInstance().trackValue(0, category: kMXKAnalyticsContactsCategory, name: AnalyticsContactsIdentityServerAccepted)
}
}
}