From b982a9630501fcd2e8989f6b6e7ce1acacb6f15b Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 18 Oct 2023 12:11:06 +0200 Subject: [PATCH 1/2] MOBILE-4362 bbb: Remove chevron in recording playback in iOS --- src/addons/mod/bigbluebuttonbn/components/index/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html index 37736d555..0b2dccaf4 100644 --- a/src/addons/mod/bigbluebuttonbn/components/index/index.html +++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html @@ -108,7 +108,7 @@

{{ recording.playbackLabel }}

-

{{ playback.name }}

From 12507793280c1f69254f9528014f3f35067198a4 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 19 Oct 2023 12:37:02 +0200 Subject: [PATCH 2/2] MOBILE-4362 auth: Fix redirect to other site in slow devices --- src/core/features/mainmenu/guards/auth.ts | 2 +- src/core/guards/redirect.ts | 6 ------ src/core/services/app.ts | 5 +++++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/core/features/mainmenu/guards/auth.ts b/src/core/features/mainmenu/guards/auth.ts index 5c3619f33..cd16ea2aa 100644 --- a/src/core/features/mainmenu/guards/auth.ts +++ b/src/core/features/mainmenu/guards/auth.ts @@ -54,7 +54,7 @@ export class CoreMainMenuAuthGuard implements CanLoad, CanActivate { // Pass redirect data (if any and belongs to same site). let redirect = CoreApp.consumeMemoryRedirect(); - if (!redirect?.timemodified || Date.now() - redirect.timemodified > 20000 || redirect.siteId !== siteId) { + if (redirect?.siteId !== siteId) { redirect = null; } diff --git a/src/core/guards/redirect.ts b/src/core/guards/redirect.ts index 4b3d88154..23e6d5e93 100644 --- a/src/core/guards/redirect.ts +++ b/src/core/guards/redirect.ts @@ -44,16 +44,10 @@ export class CoreRedirectGuard implements CanLoad, CanActivate { */ private async guard(): Promise { const redirect = CoreApp.consumeMemoryRedirect(); - if (!redirect) { return true; } - // Only accept the redirect if it was stored less than 20 seconds ago. - if (!redirect.timemodified || Date.now() - redirect.timemodified > 20000) { - return true; - } - // Redirect to site path. if (redirect.siteId && redirect.siteId !== CoreConstants.NO_SITE_ID) { const redirectData: CoreRedirectPayload = { diff --git a/src/core/services/app.ts b/src/core/services/app.ts index be8f9374a..fb4562d58 100644 --- a/src/core/services/app.ts +++ b/src/core/services/app.ts @@ -488,6 +488,11 @@ export class CoreAppProvider { this.forgetRedirect(); + if (redirect && (!redirect.timemodified || Date.now() - redirect.timemodified > 300000)) { + // Redirect data is only valid for 5 minutes, discard it. + return null; + } + return redirect; }