From 680da49a32d6d766b5d56c8e5020c451a8036238 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 16 Jun 2022 08:33:34 +0200
Subject: [PATCH 1/2] MOBILE-4081 core: Don't inject Ionic Network for plugins

---
 src/core/features/emulator/emulator.module.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/features/emulator/emulator.module.ts b/src/core/features/emulator/emulator.module.ts
index 4eedc99bb..70d1ae44b 100644
--- a/src/core/features/emulator/emulator.module.ts
+++ b/src/core/features/emulator/emulator.module.ts
@@ -36,7 +36,6 @@ import { Keyboard } from '@ionic-native/keyboard/ngx';
 import { LocalNotifications } from '@ionic-native/local-notifications/ngx';
 import { Media } from '@ionic-native/media/ngx';
 import { MediaCapture } from '@ionic-native/media-capture/ngx';
-import { Network } from '@ionic-native/network/ngx';
 import { Push } from '@ionic-native/push/ngx';
 import { QRScanner } from '@ionic-native/qr-scanner/ngx';
 import { SplashScreen } from '@ionic-native/splash-screen/ngx';
@@ -62,7 +61,6 @@ export const IONIC_NATIVE_SERVICES = [
     LocalNotifications,
     Media,
     MediaCapture,
-    Network,
     Push,
     QRScanner,
     SplashScreen,

From f8ddaaeea2c9dc764675a1b6ca085b37df6c6593 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 16 Jun 2022 08:59:32 +0200
Subject: [PATCH 2/2] MOBILE-4081 core: Pass CoreNetwork & CorePlatform to
 plugins

---
 src/core/core.module.ts                       | 4 ++++
 src/core/features/compile/services/compile.ts | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/core.module.ts b/src/core/core.module.ts
index 44ca6128e..2376f3db4 100644
--- a/src/core/core.module.ts
+++ b/src/core/core.module.ts
@@ -50,6 +50,8 @@ import { CoreUpdateManagerProvider } from '@services/update-manager';
 import { CoreUrlUtilsProvider } from '@services/utils/url';
 import { CoreUtilsProvider } from '@services/utils/utils';
 import { CoreWSProvider } from '@services/ws';
+import { CoreNetworkService } from '@services/network';
+import { CorePlatformService } from '@services/platform';
 
 export const CORE_SERVICES: Type<unknown>[] = [
     CoreAppProvider,
@@ -69,6 +71,8 @@ export const CORE_SERVICES: Type<unknown>[] = [
     CoreLocalNotificationsProvider,
     CoreMimetypeUtilsProvider,
     CoreNavigatorService,
+    CoreNetworkService,
+    CorePlatformService,
     CorePluginFileDelegateService,
     CoreScreenService,
     CoreSitesProvider,
diff --git a/src/core/features/compile/services/compile.ts b/src/core/features/compile/services/compile.ts
index fc93a3b82..82fafd18b 100644
--- a/src/core/features/compile/services/compile.ts
+++ b/src/core/features/compile/services/compile.ts
@@ -344,7 +344,7 @@ export class CoreCompileProvider {
         instance['CoreLoggerProvider'] = CoreLogger;
         instance['moment'] = moment;
         instance['Md5'] = Md5;
-        instance['Network'] = CoreNetwork.instance;
+        instance['Network'] = CoreNetwork.instance; // @deprecated on 4.1, plugins should use CoreNetworkService instead.
         instance['CoreSyncBaseProvider'] = CoreSyncBaseProvider;
         instance['CoreArray'] = CoreArray;
         instance['CoreComponentsRegistry'] = CoreComponentsRegistry;