From 496c680cd2c6b253381036d8ab842f060e773e8f Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 13 Apr 2021 09:47:21 +0200 Subject: [PATCH] undo fix for #201 as app.element.io uses mobile page & smart app banners (but keep the other cleanups we did in there) --- src/open/ClientView.js | 8 ++++++-- src/open/ClientViewModel.js | 21 ++------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/open/ClientView.js b/src/open/ClientView.js index 8924054..9b0eabc 100644 --- a/src/open/ClientView.js +++ b/src/open/ClientView.js @@ -53,8 +53,12 @@ export class ClientView extends TemplateView { ]), t.img({className: "clientIcon", src: vm.iconUrl}) ]), - t.ifView(vm => vm.showOpen, vm => new OpenClientView(vm)), - t.ifView(vm => vm.showInstall, vm => new InstallClientView(vm)) + t.mapView(vm => vm.stage, stage => { + switch (stage) { + case "open": return new OpenClientView(vm); + case "install": return new InstallClientView(vm); + } + }), ]); } } diff --git a/src/open/ClientViewModel.js b/src/open/ClientViewModel.js index 2c54232..3297abe 100644 --- a/src/open/ClientViewModel.js +++ b/src/open/ClientViewModel.js @@ -49,15 +49,6 @@ export class ClientViewModel extends ViewModel { this.installActions = this._createInstallActions(); this._clientCanIntercept = !!(this._nativePlatform && this._client.canInterceptMatrixToLinks(this._nativePlatform)); this._showOpen = this.openActions.length && !this._clientCanIntercept; - const proposedDeepLink = this._client.getDeepLink(this._proposedPlatform, this._link); - this._openWillNavigateIfNotInstalled = false; - if (this._showOpen && !isWebPlatform(this._proposedPlatform)) { - try { - if (new URL(proposedDeepLink).protocol === "https:") { - this._openWillNavigateIfNotInstalled = true; - } - } catch (err) {} - } } // these are only shown in the open stage @@ -179,16 +170,8 @@ export class ClientViewModel extends ViewModel { return this._client.icon; } - get showOpen() { - return this._showOpen; - } - - get showInstall() { - // also show install options in open screen if the deeplink is - // a https link that should be intercepted by the native app - // because if it isn't installed, you will just go to that - // website and never see the install options here. - return !this._showOpen || this._openWillNavigateIfNotInstalled; + get stage() { + return this._showOpen ? "open" : "install"; } get textInstructions() {