sij/env.esq
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #203 from matrix-org/bwindels/undo-fix-201

Browse source 
Undo fix for #201 as app.element.io uses mobile page & smart app banners
This commit is contained in:
Bruno Windels 2021-04-13 09:53:30 +02:00 committed by GitHub
commit 690fb3400c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/open/ClientView.js
View file

@ -53,8 +53,12 @@ export class ClientView extends TemplateView {
]), ]),
t.img({className: "clientIcon", src: vm.iconUrl}) t.img({className: "clientIcon", src: vm.iconUrl})
]), ]),
t.ifView(vm => vm.showOpen, vm => new OpenClientView(vm)), t.mapView(vm => vm.stage, stage => {
t.ifView(vm => vm.showInstall, vm => new InstallClientView(vm)) switch (stage) {
case "open": return new OpenClientView(vm);
case "install": return new InstallClientView(vm);
}
}),
]); ]);
} }
} }

21
src/open/ClientViewModel.js
View file

@ -49,15 +49,6 @@ export class ClientViewModel extends ViewModel {
this.installActions = this._createInstallActions(); this.installActions = this._createInstallActions();
this._clientCanIntercept = !!(this._nativePlatform && this._client.canInterceptMatrixToLinks(this._nativePlatform)); this._clientCanIntercept = !!(this._nativePlatform && this._client.canInterceptMatrixToLinks(this._nativePlatform));
this._showOpen = this.openActions.length && !this._clientCanIntercept; 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 // these are only shown in the open stage
@ -179,16 +170,8 @@ export class ClientViewModel extends ViewModel {
return this._client.icon; return this._client.icon;
} }
get showOpen() { get stage() {
return this._showOpen; return this._showOpen ? "open" : "install";
}
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 textInstructions() { get textInstructions() {