From e0f16ec49b83c190b7306704ad8bb8968cd3d599 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 12 Nov 2020 15:13:47 +0100
Subject: [PATCH] MOBILE-3585 core: Rename some helper files

---
 src/app/app.component.ts                                     | 2 +-
 .../core/contentlinks/pages/choose-site/choose-site.page.ts  | 2 +-
 src/app/core/contentlinks/services/contentlinks.helper.ts    | 2 +-
 src/app/core/emulator/emulator.module.ts                     | 5 +----
 src/app/core/emulator/services/capture.helper.ts             | 4 +++-
 .../core/emulator/services/{helper.ts => emulator.helper.ts} | 4 +++-
 src/app/core/login/components/site-help/site-help.ts         | 2 +-
 .../core/login/components/site-onboarding/site-onboarding.ts | 2 +-
 .../core/login/pages/change-password/change-password.page.ts | 2 +-
 src/app/core/login/pages/credentials/credentials.page.ts     | 2 +-
 src/app/core/login/pages/email-signup/email-signup.page.ts   | 2 +-
 .../pages/forgotten-password/forgotten-password.page.ts      | 2 +-
 src/app/core/login/pages/init/init.page.ts                   | 2 +-
 src/app/core/login/pages/reconnect/reconnect.page.ts         | 2 +-
 src/app/core/login/pages/site-policy/site-policy.page.ts     | 2 +-
 src/app/core/login/pages/site/site.page.ts                   | 2 +-
 src/app/core/login/pages/sites/sites.page.ts                 | 2 +-
 src/app/core/login/services/{helper.ts => login.helper.ts}   | 0
 src/app/core/mainmenu/pages/more/more.page.ts                | 2 +-
 19 files changed, 22 insertions(+), 21 deletions(-)
 rename src/app/core/emulator/services/{helper.ts => emulator.helper.ts} (97%)
 rename src/app/core/login/services/{helper.ts => login.helper.ts} (100%)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 2af23abcd..ce97f3c93 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -16,7 +16,7 @@ import { Component, OnInit } from '@angular/core';
 import { NavController } from '@ionic/angular';
 
 import { CoreLangProvider } from '@services/lang';
-import { CoreLoginHelperProvider } from '@core/login/services/helper';
+import { CoreLoginHelperProvider } from '@core/login/services/login.helper';
 import { CoreEvents, CoreEventSessionExpiredData } from '@singletons/events';
 import { Network, NgZone, Platform } from '@singletons/core.singletons';
 import { CoreApp } from '@services/app';
diff --git a/src/app/core/contentlinks/pages/choose-site/choose-site.page.ts b/src/app/core/contentlinks/pages/choose-site/choose-site.page.ts
index d5802ab1c..ebc2b9a95 100644
--- a/src/app/core/contentlinks/pages/choose-site/choose-site.page.ts
+++ b/src/app/core/contentlinks/pages/choose-site/choose-site.page.ts
@@ -17,7 +17,7 @@ import { NavController } from '@ionic/angular';
 import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { Translate } from '@singletons/core.singletons';
-import { CoreLoginHelper } from '@core/login/services/helper';
+import { CoreLoginHelper } from '@core/login/services/login.helper';
 import { CoreContentLinksAction } from '../../services/contentlinks.delegate';
 import { CoreContentLinksHelper } from '../../services/contentlinks.helper';
 import { ActivatedRoute } from '@angular/router';
diff --git a/src/app/core/contentlinks/services/contentlinks.helper.ts b/src/app/core/contentlinks/services/contentlinks.helper.ts
index ab6ab9cbc..dd9b835c3 100644
--- a/src/app/core/contentlinks/services/contentlinks.helper.ts
+++ b/src/app/core/contentlinks/services/contentlinks.helper.ts
@@ -17,7 +17,7 @@ import { NavController } from '@ionic/angular';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLoginHelper } from '@core/login/services/helper';
+import { CoreLoginHelper } from '@core/login/services/login.helper';
 import { CoreContentLinksDelegate, CoreContentLinksAction } from './contentlinks.delegate';
 import { CoreSite } from '@classes/site';
 import { CoreMainMenu } from '@core/mainmenu/services/mainmenu';
diff --git a/src/app/core/emulator/emulator.module.ts b/src/app/core/emulator/emulator.module.ts
index db41f24f5..03efe389b 100644
--- a/src/app/core/emulator/emulator.module.ts
+++ b/src/app/core/emulator/emulator.module.ts
@@ -16,8 +16,7 @@ import { NgModule } from '@angular/core';
 import { Platform } from '@ionic/angular';
 
 import { CoreInitDelegate } from '@services/init';
-import { CoreEmulatorHelperProvider } from './services/helper';
-import { CoreEmulatorCaptureHelperProvider } from './services/capture.helper';
+import { CoreEmulatorHelperProvider } from './services/emulator.helper';
 import { CoreEmulatorComponentsModule } from './components/components.module';
 
 // Ionic Native services.
@@ -74,8 +73,6 @@ import { ZipMock } from './services/zip';
         CoreEmulatorComponentsModule,
     ],
     providers: [
-        CoreEmulatorHelperProvider,
-        CoreEmulatorCaptureHelperProvider,
         {
             provide: Camera,
             deps: [Platform],
diff --git a/src/app/core/emulator/services/capture.helper.ts b/src/app/core/emulator/services/capture.helper.ts
index 9df20ccaa..89a3fab64 100644
--- a/src/app/core/emulator/services/capture.helper.ts
+++ b/src/app/core/emulator/services/capture.helper.ts
@@ -23,7 +23,9 @@ import { CaptureMediaComponentInputs, CoreEmulatorCaptureMediaComponent } from '
 /**
  * Helper service with some features to capture media (image, audio, video).
  */
-@Injectable()
+@Injectable({
+    providedIn: 'root',
+})
 export class CoreEmulatorCaptureHelperProvider {
 
     protected possibleAudioMimeTypes = {
diff --git a/src/app/core/emulator/services/helper.ts b/src/app/core/emulator/services/emulator.helper.ts
similarity index 97%
rename from src/app/core/emulator/services/helper.ts
rename to src/app/core/emulator/services/emulator.helper.ts
index b5c8c17e6..3e3f97ef5 100644
--- a/src/app/core/emulator/services/helper.ts
+++ b/src/app/core/emulator/services/emulator.helper.ts
@@ -25,7 +25,9 @@ import { FileTransferErrorMock } from './file-transfer';
 /**
  * Helper service for the emulator feature. It also acts as an init handler.
  */
-@Injectable()
+@Injectable({
+    providedIn: 'root',
+})
 export class CoreEmulatorHelperProvider implements CoreInitHandler {
 
     name = 'CoreEmulator';
diff --git a/src/app/core/login/components/site-help/site-help.ts b/src/app/core/login/components/site-help/site-help.ts
index 1cd9030ae..0a99681bd 100644
--- a/src/app/core/login/components/site-help/site-help.ts
+++ b/src/app/core/login/components/site-help/site-help.ts
@@ -16,7 +16,7 @@ import { Component } from '@angular/core';
 
 import { CoreUtils } from '@services/utils/utils';
 import { ModalController, Translate } from '@singletons/core.singletons';
-import { CoreLoginHelperProvider } from '@core/login/services/helper';
+import { CoreLoginHelperProvider } from '@core/login/services/login.helper';
 
 /**
  * Component that displays help to connect to a site.
diff --git a/src/app/core/login/components/site-onboarding/site-onboarding.ts b/src/app/core/login/components/site-onboarding/site-onboarding.ts
index 29e568f4e..d9d6d6144 100644
--- a/src/app/core/login/components/site-onboarding/site-onboarding.ts
+++ b/src/app/core/login/components/site-onboarding/site-onboarding.ts
@@ -16,7 +16,7 @@ import { Component } from '@angular/core';
 
 import { CoreConfig } from '@services/config';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLoginHelperProvider } from '@core/login/services/helper';
+import { CoreLoginHelperProvider } from '@core/login/services/login.helper';
 import { ModalController } from '@singletons/core.singletons';
 
 /**
diff --git a/src/app/core/login/pages/change-password/change-password.page.ts b/src/app/core/login/pages/change-password/change-password.page.ts
index b3ae64d02..88564ff77 100644
--- a/src/app/core/login/pages/change-password/change-password.page.ts
+++ b/src/app/core/login/pages/change-password/change-password.page.ts
@@ -16,7 +16,7 @@ import { Component } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreLoginHelper } from '@core/login/services/helper';
+import { CoreLoginHelper } from '@core/login/services/login.helper';
 import { Translate } from '@singletons/core.singletons';
 
 /**
diff --git a/src/app/core/login/pages/credentials/credentials.page.ts b/src/app/core/login/pages/credentials/credentials.page.ts
index 3049a0245..9d0f92491 100644
--- a/src/app/core/login/pages/credentials/credentials.page.ts
+++ b/src/app/core/login/pages/credentials/credentials.page.ts
@@ -21,7 +21,7 @@ import { CoreApp } from '@services/app';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLoginHelper, CoreLoginHelperProvider } from '@core/login/services/helper';
+import { CoreLoginHelper, CoreLoginHelperProvider } from '@core/login/services/login.helper';
 import { CoreConstants } from '@core/constants';
 import { Translate } from '@singletons/core.singletons';
 import { CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site';
diff --git a/src/app/core/login/pages/email-signup/email-signup.page.ts b/src/app/core/login/pages/email-signup/email-signup.page.ts
index e0bac5546..1aff70a6d 100644
--- a/src/app/core/login/pages/email-signup/email-signup.page.ts
+++ b/src/app/core/login/pages/email-signup/email-signup.page.ts
@@ -22,7 +22,7 @@ import { CoreDomUtils } from '@services/utils/dom';
 import { CoreTextUtils } from '@services/utils/text';
 import { CoreCountry, CoreUtils } from '@services/utils/utils';
 import { CoreWS, CoreWSExternalWarning } from '@services/ws';
-import { AuthEmailSignupProfileFieldsCategory, AuthEmailSignupSettings, CoreLoginHelper } from '@core/login/services/helper';
+import { AuthEmailSignupProfileFieldsCategory, AuthEmailSignupSettings, CoreLoginHelper } from '@core/login/services/login.helper';
 import { CoreConstants } from '@core/constants';
 import { Translate } from '@singletons/core.singletons';
 import { CoreSitePublicConfigResponse } from '@classes/site';
diff --git a/src/app/core/login/pages/forgotten-password/forgotten-password.page.ts b/src/app/core/login/pages/forgotten-password/forgotten-password.page.ts
index 8e0c357a0..ffb021905 100644
--- a/src/app/core/login/pages/forgotten-password/forgotten-password.page.ts
+++ b/src/app/core/login/pages/forgotten-password/forgotten-password.page.ts
@@ -18,7 +18,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { NavController } from '@ionic/angular';
 
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreLoginHelper } from '@core/login/services/helper';
+import { CoreLoginHelper } from '@core/login/services/login.helper';
 import { Translate, Platform } from '@singletons/core.singletons';
 import { CoreWSExternalWarning } from '@services/ws';
 
diff --git a/src/app/core/login/pages/init/init.page.ts b/src/app/core/login/pages/init/init.page.ts
index 51b7dd141..936d8dcb2 100644
--- a/src/app/core/login/pages/init/init.page.ts
+++ b/src/app/core/login/pages/init/init.page.ts
@@ -20,7 +20,7 @@ import { CoreInit } from '@services/init';
 import { SplashScreen } from '@singletons/core.singletons';
 import { CoreConstants } from '@core/constants';
 import { CoreSites } from '@/app/services/sites';
-import { CoreLoginHelper } from '@/app/core/login/services/helper';
+import { CoreLoginHelper } from '@/app/core/login/services/login.helper';
 
 /**
  * Page that displays a "splash screen" while the app is being initialized.
diff --git a/src/app/core/login/pages/reconnect/reconnect.page.ts b/src/app/core/login/pages/reconnect/reconnect.page.ts
index 3aea87e3b..449939627 100644
--- a/src/app/core/login/pages/reconnect/reconnect.page.ts
+++ b/src/app/core/login/pages/reconnect/reconnect.page.ts
@@ -21,7 +21,7 @@ import { CoreApp } from '@services/app';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { CoreLoginHelper } from '@core/login/services/helper';
+import { CoreLoginHelper } from '@core/login/services/login.helper';
 import { CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site';
 import { CoreEvents } from '@singletons/events';
 import { CoreError } from '@classes/errors/error';
diff --git a/src/app/core/login/pages/site-policy/site-policy.page.ts b/src/app/core/login/pages/site-policy/site-policy.page.ts
index ca4858feb..4a5f87f1f 100644
--- a/src/app/core/login/pages/site-policy/site-policy.page.ts
+++ b/src/app/core/login/pages/site-policy/site-policy.page.ts
@@ -20,7 +20,7 @@ import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreMimetypeUtils } from '@services/utils/mimetype';
-import { CoreLoginHelper } from '@core/login/services/helper';
+import { CoreLoginHelper } from '@core/login/services/login.helper';
 import { CoreSite } from '@classes/site';
 
 /**
diff --git a/src/app/core/login/pages/site/site.page.ts b/src/app/core/login/pages/site/site.page.ts
index 9ef042fd1..7470dca99 100644
--- a/src/app/core/login/pages/site/site.page.ts
+++ b/src/app/core/login/pages/site/site.page.ts
@@ -22,7 +22,7 @@ import { CoreConfig } from '@services/config';
 import { CoreSites, CoreSiteCheckResponse, CoreLoginSiteInfo, CoreSitesDemoSiteData } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreDomUtils } from '@services/utils/dom';
-import { CoreLoginHelper, CoreLoginHelperProvider } from '@core/login/services/helper';
+import { CoreLoginHelper, CoreLoginHelperProvider } from '@core/login/services/login.helper';
 import { CoreSite } from '@classes/site';
 import { CoreError } from '@classes/errors/error';
 import { CoreConstants } from '@core/constants';
diff --git a/src/app/core/login/pages/sites/sites.page.ts b/src/app/core/login/pages/sites/sites.page.ts
index c05b8974f..fb1e8e632 100644
--- a/src/app/core/login/pages/sites/sites.page.ts
+++ b/src/app/core/login/pages/sites/sites.page.ts
@@ -18,7 +18,7 @@ import { Component, OnInit } from '@angular/core';
 
 import { CoreSiteBasicInfo, CoreSites } from '@services/sites';
 import { CoreLogger } from '@singletons/logger';
-import { CoreLoginHelper } from '../../services/helper';
+import { CoreLoginHelper } from '@core/login/services/login.helper';
 
 /**
  * Page that displays a "splash screen" while the app is being initialized.
diff --git a/src/app/core/login/services/helper.ts b/src/app/core/login/services/login.helper.ts
similarity index 100%
rename from src/app/core/login/services/helper.ts
rename to src/app/core/login/services/login.helper.ts
diff --git a/src/app/core/mainmenu/pages/more/more.page.ts b/src/app/core/mainmenu/pages/more/more.page.ts
index 43f77bc8e..50c2028eb 100644
--- a/src/app/core/mainmenu/pages/more/more.page.ts
+++ b/src/app/core/mainmenu/pages/more/more.page.ts
@@ -18,7 +18,7 @@ import { Subscription } from 'rxjs';
 import { CoreSites } from '@services/sites';
 import { CoreUtils } from '@services/utils/utils';
 import { CoreSiteInfo } from '@classes/site';
-import { CoreLoginHelper } from '@core/login/services/helper';
+import { CoreLoginHelper } from '@core/login/services/login.helper';
 import { CoreMainMenuDelegate, CoreMainMenuHandlerData } from '../../services/mainmenu.delegate';
 import { CoreMainMenu, CoreMainMenuCustomItem } from '../../services/mainmenu';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';