Merge pull request #2371 from dpalou/MOBILE-3401

Mobile 3401

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="38200" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.8.2.0" version="3.8.2" versionCode="38200" 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="38300" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.8.3.0" version="3.8.3" 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">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
@@ -67,12 +67,6 @@
         <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application">
             <application android:usesCleartextTraffic="true" />
         </edit-config>
-        <plugin name="cordova-plugin-geolocation" spec="4.0.2">
-            <variable name="GEOLOCATION_USAGE_DESCRIPTION" value="We need your location so you can attach it as part of your submissions." />
-            <edit-config file="AndroidManifest.xml" mode="overwrite" target="/manifest/uses-feature[@android:name='android.hardware.location.gps']">
-                <uses-feature android:name="android.hardware.location.gps" android:required="false" />
-            </edit-config>
-        </plugin>
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
         </config-file>
@@ -98,7 +92,7 @@
             <true />
         </edit-config>
         <edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString">
-            <string>3.8.2</string>
+            <string>3.8.3</string>
         </edit-config>
         <config-file parent="FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED" target="*-Info.plist">
             <string>YES</string>

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.2.0" />
+    Version="3.8.3.0" />
   <Properties>
     <DisplayName>Moodle Desktop</DisplayName>
     <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",
@@ -91,7 +91,7 @@
     "cordova-plugin-file": "6.0.2",
     "cordova-plugin-file-opener2": "3.0.0",
     "cordova-plugin-file-transfer": "1.7.1",
-    "cordova-plugin-geolocation": "4.0.2",
+    "cordova-plugin-geolocation": "git+https://github.com/apache/cordova-plugin-geolocation.git#89cf51d222e8f225bdfb661965b3007d669c40ff",
     "cordova-plugin-globalization": "1.11.0",
     "cordova-plugin-inappbrowser": "3.2.0",
     "cordova-plugin-ionic-keyboard": "2.1.3",
@@ -133,6 +133,7 @@
     "@types/cordova-plugin-network-information": "0.0.3",
     "@types/node": "8.10.59",
     "@types/promise.prototype.finally": "2.0.4",
+    "acorn": "^5.7.4",
     "electron-builder-lib": "20.23.1",
     "electron-rebuild": "1.10.0",
     "gulp": "4.0.2",
@@ -143,6 +144,7 @@
     "gulp-rename": "2.0.0",
     "gulp-slash": "1.1.3",
     "lodash.template": "4.5.0",
+    "minimist": "^1.2.5",
     "node-loader": "0.6.0",
     "through": "2.3.8",
     "typescript": "2.6.2",
@@ -190,7 +192,8 @@
         "FCM_VERSION": "17.5.+"
       },
       "cordova-plugin-geolocation": {
-        "GEOLOCATION_USAGE_DESCRIPTION": "To locate you"
+        "GEOLOCATION_USAGE_DESCRIPTION": "We need your location so you can attach it as part of your submissions.",
+        "GPS_REQUIRED": "false"
       },
       "cordova-plugin-ionic-webview": {},
       "cordova-plugin-advanced-http": {
@@ -237,7 +240,7 @@
       "category": "public.app-category.education",
       "icon": "resources/desktop/icon.icns",
       "target": "mas",
-      "bundleVersion": "3.8.2",
+      "bundleVersion": "3.8.3",
       "extendInfo": {
         "ElectronTeamID": "2NU57U5PAW"
       }

src/config.json

@@ -2,8 +2,8 @@
     "app_id": "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
     "desktopappname": "Moodle Desktop",
-    "versioncode": 3820,
+    "versioncode": 3830,
-    "versionname": "3.8.2-dev",
+    "versionname": "3.8.3-dev",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,