Merge pull request #1830 from moodlehq/integration

Integration

Author: jleyva

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+Dockerfile

.gitattributes

@@ -0,0 +1,8 @@
+# This file has been retrieved from angular repository.
+
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# JS and TS files must always use LF for tools to work
+*.js eol=lf
+*.ts eol=lf

.travis.yml

@@ -1,16 +1,23 @@
 sudo: required
-dist: trusty
+dist: xenial
 group: edge
 
 language: node_js
-node_js:
-  - '8.10'
+node_js: stable
+
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder/wine
+
+cache:
+  directories:
+    - node_modules
+    - $HOME/.cache/electron
+    - $HOME/.cache/electron-builder
 
 before_script:
   - npm install -g @angular/cli
   - npm i npm@latest -g
   - gulp
-  - rm -Rf node_modules/electron-builder-squirrel-windows node_modules/electron-windows-notifications #Avoid electron fail
 
 script:
   - npm run build

Dockerfile

@@ -0,0 +1,27 @@
+# This image is based on the fat node 11 image.
+# We require fat images as neither alpine, or slim, include git binaries.
+FROM node:11
+
+# Port 8100 for ionic dev server.
+EXPOSE 8100
+
+# Port 35729 is the live-reload server.
+EXPOSE 35729
+
+# Port 53703 is the Chrome dev logger port.
+EXPOSE 53703
+
+# MoodleMobile uses Cordova, Ionic, and Gulp.
+RUN npm install -g cordova ionic gulp && rm -rf /root/.npm
+
+WORKDIR /app
+
+COPY . /app
+
+# The setup script will handle npm installation, cordova setup, and gulp setup.
+RUN npm run setup && rm -rf /root/.npm
+
+# Provide a Healthcheck command for easier use in CI.
+HEALTHCHECK --interval=10s --timeout=3s --start-period=30s CMD curl -f http://localhost:8100 || exit 1
+
+CMD ["ionic", "serve", "-b"]

GoogleService-Info.plist

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
+	<string>ca-app-pub-3940256099942544/2934735716</string>
+	<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
+	<string>ca-app-pub-3940256099942544/4411468910</string>
+	<key>CLIENT_ID</key>
+	<string>694767596569-c2cjrca92k99f6nkp3363lsb7ljhdgdr.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.694767596569-c2cjrca92k99f6nkp3363lsb7ljhdgdr</string>
+	<key>API_KEY</key>
+	<string>AIzaSyA-77ZjkxII6GV97CC9rdUl83rzdEXu_rM</string>
+	<key>GCM_SENDER_ID</key>
+	<string>694767596569</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.moodle.moodlemobile</string>
+	<key>PROJECT_ID</key>
+	<string>moodlemobile-push</string>
+	<key>STORAGE_BUCKET</key>
+	<string>moodlemobile-push.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<true></true>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:694767596569:ios:a4cdad4d168c9d1a</string>
+	<key>DATABASE_URL</key>
+	<string>https://moodlemobile-push.firebaseio.com</string>
+</dict>
+</plist>

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.moodle.moodlemobile" version="3.6.0" 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 id="com.moodle.moodlemobile" version="3.6.1" 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="[email protected]" href="http://moodle.com">Moodle Mobile team</author>
@@ -41,6 +41,7 @@
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
     <platform name="android">
+        <resource-file src="google-services.json" target="app/google-services.json" />
         <splash qualifier="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
         <splash qualifier="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
         <splash qualifier="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
@@ -59,8 +60,25 @@
         <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
         <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
         <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+        <resource-file src="resources/android/icon/drawable-ldpi-smallicon.png" target="app/src/main/res/mipmap-ldpi/smallicon.png" />
+        <resource-file src="resources/android/icon/drawable-mdpi-smallicon.png" target="app/src/main/res/mipmap-mdpi/smallicon.png" />
+        <resource-file src="resources/android/icon/drawable-hdpi-smallicon.png" target="app/src/main/res/mipmap-hdpi/smallicon.png" />
+        <resource-file src="resources/android/icon/drawable-xhdpi-smallicon.png" target="app/src/main/res/mipmap-xhdpi/smallicon.png" />
+        <resource-file src="resources/android/splash/drawable-land-hdpi-screen.png" target="app/src/main/res/drawable-land-hdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-land-ldpi-screen.png" target="app/src/main/res/drawable-land-ldpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-land-mdpi-screen.png" target="app/src/main/res/drawable-land-mdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-land-xhdpi-screen.png" target="app/src/main/res/drawable-land-xhdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-land-xxhdpi-screen.png" target="app/src/main/res/drawable-land-xxhdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-land-xxxhdpi-screen.png" target="app/src/main/res/drawable-land-xxxhdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-port-hdpi-screen.png" target="app/src/main/res/drawable-port-hdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-port-ldpi-screen.png" target="app/src/main/res/drawable-port-ldpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-port-mdpi-screen.png" target="app/src/main/res/drawable-port-mdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-port-xhdpi-screen.png" target="app/src/main/res/drawable-port-xhdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-port-xxhdpi-screen.png" target="app/src/main/res/drawable-port-xxhdpi/screen.png" />
+        <resource-file src="resources/android/splash/drawable-port-xxxhdpi-screen.png" target="app/src/main/res/drawable-port-xxxhdpi/screen.png" />
     </platform>
     <platform name="ios">
+        <resource-file src="GoogleService-Info.plist" />
         <icon height="57" src="resources/ios/icon/icon.png" width="57" />
         <icon height="114" src="resources/ios/icon/[email protected]" width="114" />
         <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
@@ -94,7 +112,7 @@
         <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
         <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
     </platform>
-    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="1.1.1" />
+    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="1.1.5" />
     <plugin name="cordova-android-support-gradle-release" spec="2.0.1">
         <variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" />
     </plugin>
@@ -111,7 +129,7 @@
     <plugin name="cordova-plugin-globalization" spec="1.11.0" />
     <plugin name="cordova-plugin-inappbrowser" spec="3.0.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="2.1.3" />
-    <plugin name="cordova-plugin-local-notifications-mm" spec="1.0.13" />
+    <plugin name="cordova-plugin-local-notification" spec="0.9.0-beta.3" />
     <plugin name="cordova-plugin-media-capture" spec="3.0.2" />
     <plugin name="cordova-plugin-network-information" spec="2.0.1" />
     <plugin name="cordova-plugin-screen-orientation" spec="3.0.1" />
@@ -121,8 +139,9 @@
     <plugin name="cordova-plugin-zip" spec="3.1.0" />
     <plugin name="cordova-sqlite-storage" spec="2.6.0" />
     <plugin name="nl.kingsquare.cordova.background-audio" spec="1.0.1" />
-    <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle">
-        <variable name="SENDER_ID" value="694767596569" />
+    <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v2">
+        <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
+        <variable name="FCM_VERSION" value="17.0.+" />
     </plugin>
     <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" android:debuggable="true" />

config/copy.config.js

@@ -1,4 +1,4 @@
-// New copy task for font files
+// New copy task for font files and config.json.
 module.exports = {
   // Override Ionic copyFonts task to exclude Roboto and Noto fonts.
   copyFonts: {
@@ -8,5 +8,9 @@ module.exports = {
   copyFontAwesome: {
     src: ['{{ROOT}}/node_modules/font-awesome/fonts/**/*'],
     dest: '{{WWW}}/assets/fonts'
+  },
+  copyConfig: {
+    src: ['{{ROOT}}/src/config.json'],
+    dest: '{{WWW}}/'
   }
 };

desktop/assets/windows/AppXManifest.xml

@@ -6,7 +6,7 @@
   <Identity Name="3312ADB7.MoodleDesktop"
     ProcessorArchitecture="x64"
     Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
-    Version="3.6.0.0" />
+    Version="3.6.1.0" />
   <Properties>
     <DisplayName>Moodle Desktop</DisplayName>
     <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

desktop/electron.js

@@ -70,6 +70,26 @@ function createWindow() {
     mainWindow.webContents.setUserAgent(mainWindow.webContents.getUserAgent() + ' ' + userAgent);
 }
 
+// Make sure that only a single instance of the app is running.
+// For some reason, gotTheLock is always false in signed Mac apps so we should ingore it.
+// See https://github.com/electron/electron/issues/15958
+var gotTheLock = app.requestSingleInstanceLock();
+
+if (!gotTheLock && os.platform().indexOf('darwin') == -1) {
+    // It's not the main instance of the app, kill it.
+    app.exit();
+    return;
+}
+
+app.on('second-instance', (event, commandLine, workingDirectory) => {
+    // Another instance was launched. If it was launched with a URL, it should be in the second param.
+    if (commandLine && commandLine[1]) {
+        appLaunched(commandLine[1]);
+    } else {
+        focusApp();
+    }
+});
+
 // This method will be called when Electron has finished initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 app.on('ready', function() {
@@ -122,23 +142,6 @@ fs.readFile(path.join(__dirname, 'config.json'), 'utf8', (err, data) => {
     }
 });
 
-// Make sure that only a single instance of the app is running.
-var shouldQuit = app.makeSingleInstance((argv, workingDirectory) => {
-    // Another instance was launched. If it was launched with a URL, it should be in the second param.
-    if (argv && argv[1]) {
-        appLaunched(argv[1]);
-    } else {
-        focusApp();
-    }
-});
-
-// For some reason, shouldQuit is always true in signed Mac apps so we should ingore it.
-if (shouldQuit && os.platform().indexOf('darwin') == -1) {
-    // It's not the main instance of the app, kill it.
-    app.exit();
-    return;
-}
-
 // Listen for open-url events (Mac OS only).
 app.on('open-url', (event, url) => {
     event.preventDefault();

google-services.json

@@ -0,0 +1,45 @@
+{
+  "project_info": {
+    "project_number": "694767596569",
+    "firebase_url": "https://moodlemobile-push.firebaseio.com",
+    "project_id": "moodlemobile-push",
+    "storage_bucket": "moodlemobile-push.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:694767596569:android:a4cdad4d168c9d1a",
+        "android_client_info": {
+          "package_name": "com.moodle.moodlemobile"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "694767596569-icveqqa2n56oh44l6ev1dr2oh67nh8il.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCb2zogu0P_aZ2LNgdwzshWExITPKTXJyk"
+        },
+        {
+          "current_key": "AIzaSyDRT1HwT0gSsTty0whOVtoNKAh8SPrJXLE"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}