EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3833 utils: Remove injected service

main
Noel De Martin 2021-08-12 11:11:54 +02:00
parent 7b41b7716c
commit f86c2af9bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/services/utils/utils.ts
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import { Injectable, NgZone } from '@angular/core'; import { Injectable } from '@angular/core';
import { InAppBrowserObject, InAppBrowserOptions } from '@ionic-native/in-app-browser'; import { InAppBrowserObject, InAppBrowserOptions } from '@ionic-native/in-app-browser';
import { FileEntry } from '@ionic-native/file/ngx'; import { FileEntry } from '@ionic-native/file/ngx';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
@ -26,7 +26,7 @@ import { CoreDomUtils } from '@services/utils/dom';
import { CoreMimetypeUtils } from '@services/utils/mimetype'; import { CoreMimetypeUtils } from '@services/utils/mimetype';
import { CoreTextUtils } from '@services/utils/text'; import { CoreTextUtils } from '@services/utils/text';
import { CoreWSError } from '@classes/errors/wserror'; import { CoreWSError } from '@classes/errors/wserror';
import { makeSingleton, Clipboard, InAppBrowser, FileOpener, WebIntent, QRScanner, Translate } from '@singletons'; import { makeSingleton, Clipboard, InAppBrowser, FileOpener, WebIntent, QRScanner, Translate, NgZone } from '@singletons';
import { CoreLogger } from '@singletons/logger'; import { CoreLogger } from '@singletons/logger';
import { CoreFileSizeSum } from '@services/plugin-file-delegate'; import { CoreFileSizeSum } from '@services/plugin-file-delegate';
import { CoreViewerQRScannerComponent } from '@features/viewer/components/qr-scanner/qr-scanner'; import { CoreViewerQRScannerComponent } from '@features/viewer/components/qr-scanner/qr-scanner';
@ -49,7 +49,7 @@ export class CoreUtilsProvider {
protected uniqueIds: {[name: string]: number} = {}; protected uniqueIds: {[name: string]: number} = {};
protected qrScanData?: {deferred: PromiseDefer<string>; observable: Subscription}; protected qrScanData?: {deferred: PromiseDefer<string>; observable: Subscription};
constructor(protected zone: NgZone) { constructor() {
this.logger = CoreLogger.getInstance('CoreUtilsProvider'); this.logger = CoreLogger.getInstance('CoreUtilsProvider');
} }
@ -1005,7 +1005,7 @@ export class CoreUtilsProvider {
// Trigger global events when a url is loaded or the window is closed. This is to make it work like in Ionic 1. // Trigger global events when a url is loaded or the window is closed. This is to make it work like in Ionic 1.
const loadStartSubscription = this.iabInstance.on('loadstart').subscribe((event) => { const loadStartSubscription = this.iabInstance.on('loadstart').subscribe((event) => {
// Execute the callback in the Angular zone, so change detection doesn't stop working. // Execute the callback in the Angular zone, so change detection doesn't stop working.
this.zone.run(() => { NgZone.run(() => {
// Store the last loaded URLs (max 10). // Store the last loaded URLs (max 10).
loadStartUrls.push(event.url); loadStartUrls.push(event.url);
if (loadStartUrls.length > 10) { if (loadStartUrls.length > 10) {
@ -1020,7 +1020,7 @@ export class CoreUtilsProvider {
// Load stop is needed with InAppBrowser v3. Custom URL schemes no longer trigger load start, simulate it. // Load stop is needed with InAppBrowser v3. Custom URL schemes no longer trigger load start, simulate it.
loadStopSubscription = this.iabInstance.on('loadstop').subscribe((event) => { loadStopSubscription = this.iabInstance.on('loadstop').subscribe((event) => {
// Execute the callback in the Angular zone, so change detection doesn't stop working. // Execute the callback in the Angular zone, so change detection doesn't stop working.
this.zone.run(() => { NgZone.run(() => {
if (loadStartUrls.indexOf(event.url) == -1) { if (loadStartUrls.indexOf(event.url) == -1) {
// The URL was stopped but not started, probably a custom URL scheme. // The URL was stopped but not started, probably a custom URL scheme.
CoreEvents.trigger(CoreEvents.IAB_LOAD_START, event); CoreEvents.trigger(CoreEvents.IAB_LOAD_START, event);
@ -1031,7 +1031,7 @@ export class CoreUtilsProvider {
const exitSubscription = this.iabInstance.on('exit').subscribe((event) => { const exitSubscription = this.iabInstance.on('exit').subscribe((event) => {
// Execute the callback in the Angular zone, so change detection doesn't stop working. // Execute the callback in the Angular zone, so change detection doesn't stop working.
this.zone.run(() => { NgZone.run(() => {
loadStartSubscription.unsubscribe(); loadStartSubscription.unsubscribe();
loadStopSubscription && loadStopSubscription.unsubscribe(); loadStopSubscription && loadStopSubscription.unsubscribe();
exitSubscription.unsubscribe(); exitSubscription.unsubscribe();