From c422a89958c3242b4360a24aaea7ed7727f05afd Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Wed, 28 Feb 2024 09:51:49 +0100 Subject: [PATCH] merge with developer done --- src/app/home/home.page.ts | 1 - .../view-publications/view-publications.page.ts | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 82b6150ee..86b6411b1 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -159,7 +159,6 @@ export class HomePage implements OnInit { SendIntent.checkSendIntentReceived().then((result: any) => { - alert('shared') if (result) { console.log('SendIntent received'); console.log(JSON.stringify(result)); diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index cc12b5a37..bd546b05c 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -1,6 +1,6 @@ import { Component, ElementRef, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { ModalController, IonicSlides } from '@ionic/angular'; +import { ModalController, IonicSlides, Platform } from '@ionic/angular'; import { Publication } from 'src/app/models/publication'; import { PublicationFolder } from 'src/app/models/publicationfolder'; import { PublicationPipe } from 'src/app/pipes/publication.pipe'; @@ -68,7 +68,8 @@ export class ViewPublicationsPage implements OnInit { public publicationFolderService: PublicationFolderService, public checkFileType: checkFileTypeService, private publicationVideoManagerService: PublicationVideoManagerService, - public stopvideoService: StopvideoService) { + public stopvideoService: StopvideoService, + private platform: Platform,) { /* this.publicationVideoManagerService.setContainer(this.VideoManager.nativeElement) */ @@ -192,7 +193,8 @@ export class ViewPublicationsPage implements OnInit { goBack() { if (window["sharedContent"]) { - App.exitApp(); + if (this.platform.is('android')) + App.exitApp(); return } this.router.navigate(['/home/publications']);