merge with developer done

This commit is contained in:
Equilibrium ITO
2024-02-28 09:51:49 +01:00
parent 79f78423b3
commit c422a89958
2 changed files with 5 additions and 4 deletions
-1
View File
@@ -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));
@@ -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']);