Merge pull request #2407 from dpalou/MOBILE-3401

Mobile 3401
2020-06-15 10:59:59 +02:00 · 2020-06-15 10:59:59 +02:00 · 7f5eef39ae
commit 7f5eef39ae
parent 428e753ca6 46b8211442
7 changed files with 110 additions and 48 deletions
--- a/config.xml
+++ b/config.xml
@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="38310" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.8.3.0" version="3.8.3-dev" versionCode="38300" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="39000" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.9.0.0" version="3.9.0-dev" versionCode="39000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
    <name>Moodle</name>
    <description>Moodle official app</description>
    <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
@ -91,7 +91,7 @@
            <true />
        </edit-config>
        <edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString">
-            <string>3.8.3-dev</string>
+            <string>3.9.0-dev</string>
        </edit-config>
        <config-file parent="FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED" target="*-Info.plist">
            <string>YES</string>
--- a/desktop/assets/windows/AppXManifest.xml
+++ b/desktop/assets/windows/AppXManifest.xml
@ -6,7 +6,7 @@
  <Identity Name="3312ADB7.MoodleDesktop"
    ProcessorArchitecture="x64"
    Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
-    Version="3.8.3.0" />
+    Version="3.9.0.0" />
  <Properties>
    <DisplayName>Moodle Desktop</DisplayName>
    <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "moodlemobile",
-  "version": "3.8.3",
+  "version": "3.9.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -3712,8 +3712,9 @@
      "integrity": "sha1-6sMVgQAphJOvowvolA5pj2HvvP4="
    },
    "cordova-plugin-inappbrowser": {
-      "version": "git+https://github.com/apache/cordova-plugin-inappbrowser.git#d2b512ed048ce9345e61901b29ba7dd4271a73bf",
-      "from": "git+https://github.com/apache/cordova-plugin-inappbrowser.git#d2b512ed048ce9345e61901b29ba7dd4271a73bf"
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-4.0.0.tgz",
+      "integrity": "sha512-w2LZzdF3R4G/EqVZ9aWch9Pksk76uw6/S5wFP1sgn7zjsSDpJBb/JhazLnioN1NZmZiCUBbROv1S4+9JCkeCgA=="
    },
    "cordova-plugin-ionic-keyboard": {
      "version": "2.1.3",
@ -6231,7 +6232,8 @@
        "ansi-regex": {
          "version": "2.1.1",
          "resolved": false,
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "optional": true
        },
        "aproba": {
          "version": "1.2.0",
@ -6252,12 +6254,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "resolved": false,
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "resolved": false,
          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -6272,17 +6276,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "resolved": false,
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "resolved": false,
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "resolved": false,
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -6407,7 +6414,8 @@
        "inherits": {
          "version": "2.0.3",
          "resolved": false,
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@ -6419,6 +6427,7 @@
          "version": "1.0.0",
          "resolved": false,
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@ -6433,6 +6442,7 @@
          "version": "3.0.4",
          "resolved": false,
          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@ -6476,6 +6486,7 @@
          "version": "0.5.1",
          "resolved": false,
          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          },
@ -6483,7 +6494,8 @@
            "minimist": {
              "version": "0.0.8",
              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+              "optional": true
            }
          }
        },
@ -6582,7 +6594,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "resolved": false,
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@ -6594,6 +6607,7 @@
          "version": "1.4.0",
          "resolved": false,
          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@ -6715,6 +6729,7 @@
          "version": "1.0.2",
          "resolved": false,
          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@ -6734,6 +6749,7 @@
          "version": "3.0.1",
          "resolved": false,
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@ -6789,7 +6805,8 @@
        "wrappy": {
          "version": "1.0.2",
          "resolved": false,
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+          "optional": true
        },
        "yallist": {
          "version": "3.0.3",
@ -7273,7 +7290,8 @@
              "version": "2.1.1",
              "resolved": false,
              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "aproba": {
              "version": "1.2.0",
@ -7297,13 +7315,15 @@
              "version": "1.0.0",
              "resolved": false,
              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "brace-expansion": {
              "version": "1.1.11",
              "resolved": false,
              "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
              "dev": true,
+              "optional": true,
              "requires": {
                "balanced-match": "^1.0.0",
                "concat-map": "0.0.1"
@ -7320,19 +7340,22 @@
              "version": "1.1.0",
              "resolved": false,
              "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "concat-map": {
              "version": "0.0.1",
              "resolved": false,
              "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "console-control-strings": {
              "version": "1.1.0",
              "resolved": false,
              "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "core-util-is": {
              "version": "1.0.2",
@ -7463,7 +7486,8 @@
              "version": "2.0.3",
              "resolved": false,
              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "ini": {
              "version": "1.3.5",
@ -7477,6 +7501,7 @@
              "resolved": false,
              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
              "dev": true,
+              "optional": true,
              "requires": {
                "number-is-nan": "^1.0.0"
              }
@ -7493,6 +7518,7 @@
              "resolved": false,
              "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
              "dev": true,
+              "optional": true,
              "requires": {
                "brace-expansion": "^1.1.7"
              }
@ -7501,13 +7527,15 @@
              "version": "0.0.8",
              "resolved": false,
              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "minipass": {
              "version": "2.3.5",
              "resolved": false,
              "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
              "dev": true,
+              "optional": true,
              "requires": {
                "safe-buffer": "^5.1.2",
                "yallist": "^3.0.0"
@ -7528,6 +7556,7 @@
              "resolved": false,
              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
              "dev": true,
+              "optional": true,
              "requires": {
                "minimist": "0.0.8"
              }
@ -7616,7 +7645,8 @@
              "version": "1.0.1",
              "resolved": false,
              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "object-assign": {
              "version": "4.1.1",
@ -7630,6 +7660,7 @@
              "resolved": false,
              "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
              "dev": true,
+              "optional": true,
              "requires": {
                "wrappy": "1"
              }
@ -7725,7 +7756,8 @@
              "version": "5.1.2",
              "resolved": false,
              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "safer-buffer": {
              "version": "2.1.2",
@ -7767,6 +7799,7 @@
              "resolved": false,
              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
              "dev": true,
+              "optional": true,
              "requires": {
                "code-point-at": "^1.0.0",
                "is-fullwidth-code-point": "^1.0.0",
@ -7788,6 +7821,7 @@
              "resolved": false,
              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
              "dev": true,
+              "optional": true,
              "requires": {
                "ansi-regex": "^2.0.0"
              }
@ -7836,13 +7870,15 @@
              "version": "1.0.2",
              "resolved": false,
              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "yallist": {
              "version": "3.0.3",
              "resolved": false,
              "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-              "dev": true
+              "dev": true,
+              "optional": true
            }
          }
        },
@ -14904,7 +14940,8 @@
              "version": "2.1.1",
              "resolved": false,
              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "aproba": {
              "version": "1.2.0",
@ -14928,13 +14965,15 @@
              "version": "1.0.0",
              "resolved": false,
              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "brace-expansion": {
              "version": "1.1.11",
              "resolved": false,
              "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
              "dev": true,
+              "optional": true,
              "requires": {
                "balanced-match": "^1.0.0",
                "concat-map": "0.0.1"
@ -14951,19 +14990,22 @@
              "version": "1.1.0",
              "resolved": false,
              "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "concat-map": {
              "version": "0.0.1",
              "resolved": false,
              "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "console-control-strings": {
              "version": "1.1.0",
              "resolved": false,
              "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "core-util-is": {
              "version": "1.0.2",
@ -15094,7 +15136,8 @@
              "version": "2.0.3",
              "resolved": false,
              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "ini": {
              "version": "1.3.5",
@ -15108,6 +15151,7 @@
              "resolved": false,
              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
              "dev": true,
+              "optional": true,
              "requires": {
                "number-is-nan": "^1.0.0"
              }
@ -15124,6 +15168,7 @@
              "resolved": false,
              "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
              "dev": true,
+              "optional": true,
              "requires": {
                "brace-expansion": "^1.1.7"
              }
@ -15132,13 +15177,15 @@
              "version": "0.0.8",
              "resolved": false,
              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "minipass": {
              "version": "2.3.5",
              "resolved": false,
              "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
              "dev": true,
+              "optional": true,
              "requires": {
                "safe-buffer": "^5.1.2",
                "yallist": "^3.0.0"
@ -15159,6 +15206,7 @@
              "resolved": false,
              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
              "dev": true,
+              "optional": true,
              "requires": {
                "minimist": "0.0.8"
              }
@ -15247,7 +15295,8 @@
              "version": "1.0.1",
              "resolved": false,
              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "object-assign": {
              "version": "4.1.1",
@ -15261,6 +15310,7 @@
              "resolved": false,
              "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
              "dev": true,
+              "optional": true,
              "requires": {
                "wrappy": "1"
              }
@ -15356,7 +15406,8 @@
              "version": "5.1.2",
              "resolved": false,
              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "safer-buffer": {
              "version": "2.1.2",
@ -15398,6 +15449,7 @@
              "resolved": false,
              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
              "dev": true,
+              "optional": true,
              "requires": {
                "code-point-at": "^1.0.0",
                "is-fullwidth-code-point": "^1.0.0",
@ -15419,6 +15471,7 @@
              "resolved": false,
              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
              "dev": true,
+              "optional": true,
              "requires": {
                "ansi-regex": "^2.0.0"
              }
@ -15467,13 +15520,15 @@
              "version": "1.0.2",
              "resolved": false,
              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-              "dev": true
+              "dev": true,
+              "optional": true
            },
            "yallist": {
              "version": "3.0.3",
              "resolved": false,
              "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-              "dev": true
+              "dev": true,
+              "optional": true
            }
          }
        },
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "moodlemobile",
-  "version": "3.8.3",
+  "version": "3.9.0",
  "description": "The official app for Moodle.",
  "author": {
    "name": "Moodle Pty Ltd.",
@ -101,7 +101,7 @@
    "cordova-plugin-file-transfer": "1.7.1",
    "cordova-plugin-geolocation": "git+https://github.com/apache/cordova-plugin-geolocation.git#89cf51d222e8f225bdfb661965b3007d669c40ff",
    "cordova-plugin-globalization": "1.11.0",
-    "cordova-plugin-inappbrowser": "git+https://github.com/apache/cordova-plugin-inappbrowser.git#d2b512ed048ce9345e61901b29ba7dd4271a73bf",
+    "cordova-plugin-inappbrowser": "4.0.0",
    "cordova-plugin-ionic-keyboard": "2.1.3",
    "cordova-plugin-ionic-webview": "4.1.3",
    "cordova-plugin-local-notification": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle",
@ -251,7 +251,7 @@
      "category": "public.app-category.education",
      "icon": "resources/desktop/icon.icns",
      "target": "mas",
-      "bundleVersion": "3.8.3",
+      "bundleVersion": "3.9.0",
      "extendInfo": {
        "ElectronTeamID": "2NU57U5PAW"
      }
--- a/src/config.json
+++ b/src/config.json
@ -2,8 +2,8 @@
    "app_id": "com.moodle.moodlemobile",
    "appname": "Moodle Mobile",
    "desktopappname": "Moodle Desktop",
-    "versioncode": 3830,
-    "versionname": "3.8.3-dev",
+    "versioncode": 3900,
+    "versionname": "3.9.0-dev",
    "cache_update_frequency_usually": 420000,
    "cache_update_frequency_often": 1200000,
    "cache_update_frequency_sometimes": 3600000,
--- a/src/core/login/providers/helper.ts
+++ b/src/core/login/providers/helper.ts
@ -83,6 +83,7 @@ export class CoreLoginHelperProvider {
    protected isSSOConfirmShown = false;
    protected isOpenEditAlertShown = false;
    protected pageToLoad: {page: string, params: any, time: number}; // Page to load once main menu is opened.
+    protected isOpeningReconnect = false;
    waitingForBrowser = false;

    constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
@ -1135,7 +1136,7 @@ export class CoreLoginHelperProvider {
                }

                const info = currentSite.getInfo();
-                if (typeof info != 'undefined' && typeof info.username != 'undefined') {
+                if (typeof info != 'undefined' && typeof info.username != 'undefined' && !this.isOpeningReconnect) {
                    const rootNavCtrl = this.appProvider.getRootNavController(),
                        activePage = rootNavCtrl.getActive();

@ -1144,6 +1145,8 @@ export class CoreLoginHelperProvider {
                        return;
                    }

+                    this.isOpeningReconnect = true;
+
                    rootNavCtrl.setRoot('CoreLoginReconnectPage', {
                        infoSiteUrl: info.siteurl,
                        siteUrl: result.siteUrl,
@ -1151,6 +1154,8 @@ export class CoreLoginHelperProvider {
                        pageName: data.pageName,
                        pageParams: data.params,
                        siteConfig: result.config
+                    }).finally(() => {
+                        this.isOpeningReconnect = false;
                    });
                }
            }
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@ -86,12 +86,14 @@ export class CoreUtilsProvider {
            protected qrScanner: QRScanner) {
        this.logger = logger.getInstance('CoreUtilsProvider');

-        const win = <any> window;
+        this.platform.ready().then(() => {
+            const win = <any> window;

-        if (win.cordova && win.cordova.InAppBrowser) {
-            // Override the default window.open with the InAppBrowser one.
-            win.open = win.cordova.InAppBrowser.open;
-        }
+            if (win.cordova && win.cordova.InAppBrowser) {
+                // Override the default window.open with the InAppBrowser one.
+                win.open = win.cordova.InAppBrowser.open;
+            }
+        });
    }

    /**