Merge pull request #2411 from crazyserver/MOBILE-3401

MOBILE-3401 login: Enable qr instructions

Author: jleyva

src/core/login/pages/site-help/site-help.ts

@@ -37,7 +37,7 @@ export class CoreLoginSiteHelpPage {
             protected translate: TranslateService,
             protected utils: CoreUtilsProvider) {
 
-        this.canScanQR = this.utils.canScanQR() && false; // @todo: Enable it for 3.9 release.
+        this.canScanQR = this.utils.canScanQR();
         this.urlImageHtml = CoreLoginHelperProvider.FAQ_URL_IMAGE_HTML;
         this.qrCodeImageHtml = CoreLoginHelperProvider.FAQ_QRCODE_IMAGE_HTML;
         this.setupLinkHtml = '<a href="https://moodle.com/getstarted/" title="' +

src/core/login/pages/site/site.html

@@ -60,7 +60,7 @@ <h2 text-wrap>{{site.name}}<ng-container *ngIf="site.alias"> ({{site.alias}})</n
             <ng-container *ngIf="!fixedSites && showScanQR && !hasSites && !enteredSiteUrl">
                 <div class="core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
                 <ion-item>
-                    <a ion-button block color="light" margin-top icon-start (click)="scanQR()">
+                    <a ion-button block color="light" margin-top icon-start (click)="showInstructionsAndScanQR()">
                         <core-icon name="fa-qrcode" aria-hidden="true"></core-icon>
                         {{ 'core.scanqr' | translate }}
                     </a>

src/core/login/pages/site/site.ts

@@ -279,7 +279,7 @@ export class CoreLoginSitePage {
             }
         ];
 
-        // @TODO: Remove CoreSite.MINIMUM_MOODLE_VERSION, not used on translations since 3.8.3.
+        // @TODO: Remove CoreSite.MINIMUM_MOODLE_VERSION, not used on translations since 3.9.0.
         this.domUtils.showAlertWithOptions({
             title: this.translate.instant('core.cannotconnect', {$a: CoreSite.MINIMUM_MOODLE_VERSION}),
             message,
@@ -383,8 +383,6 @@ export class CoreLoginSitePage {
 
     /**
      * Show instructions and scan QR code.
-     *
-     * @todo Use it in 3.9 release instead of scanQR.
      */
     showInstructionsAndScanQR(): void {
         // Show some instructions first.