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

MOBILE-3320 network: Fix Connection type usage

main
Noel De Martin 2021-02-25 11:22:22 +01:00
parent aed159df7c
commit bf8b33fa61
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/services/app.ts
View File

@ -14,7 +14,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Params } from '@angular/router'; import { Params } from '@angular/router';
import { Connection } from '@ionic-native/network/ngx';
import { CoreDB } from '@services/db'; import { CoreDB } from '@services/db';
import { CoreEvents } from '@singletons/events'; import { CoreEvents } from '@singletons/events';
@ -341,8 +340,9 @@ export class CoreAppProvider {
return false; return false;
} }
let online = Network.instance.type !== null && Number(Network.instance.type) != Connection.NONE && let online = Network.instance.type !== null && Network.instance.type != Network.instance.Connection.NONE &&
Number(Network.instance.type) != Connection.UNKNOWN; Network.instance.type != Network.instance.Connection.UNKNOWN;
// Double check we are not online because we cannot rely 100% in Cordova APIs. Also, check it in browser. // Double check we are not online because we cannot rely 100% in Cordova APIs. Also, check it in browser.
if (!online && navigator.onLine) { if (!online && navigator.onLine) {
online = true; online = true;
@ -363,9 +363,14 @@ export class CoreAppProvider {
return false; return false;
} }
const limited = [Connection.CELL_2G, Connection.CELL_3G, Connection.CELL_4G, Connection.CELL]; const limited = [
Network.instance.Connection.CELL_2G,
Network.instance.Connection.CELL_3G,
Network.instance.Connection.CELL_4G,
Network.instance.Connection.CELL,
];
return limited.indexOf(Number(type)) > -1; return limited.indexOf(type) > -1;
} }
/** /**