'Fairoj:IssuesFixed'

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "disabled"
+}

config.xml

@@ -23,6 +23,7 @@
     <preference name="ShowSplashScreenSpinner" value="false" />
     <platform name="android">
         <allow-intent href="market:*" />
+        <resource-file src="resources/android/icon/drawable-xxxhdpi-icon.png" target="app/src/main/res/mipmap/icon.png" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
         <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
         <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
@@ -93,23 +94,11 @@
         <variable name="GEOLOCATION_USAGE_DESCRIPTION" value="To track your walks" />
     </plugin>
     <plugin name="cordova-plugin-request-location-accuracy" spec="2.2.3" />
-    <plugin name="cordova-sqlite-storage" spec="2.6.0" />
     <plugin name="cordova-plugin-android-permissions" spec="1.0.0" />
-    <plugin name="cordova-plugin-mauron85-background-geolocation" spec="3.0.0-alpha.50">
-        <variable name="GOOGLE_PLAY_SERVICES_VERSION" value="11+" />
-        <variable name="ANDROID_SUPPORT_LIBRARY_VERSION" value="26+" />
-        <variable name="ICON" value="@mipmap/icon" />
-        <variable name="SMALL_ICON" value="@mipmap/icon" />
-        <variable name="ACCOUNT_NAME" value="@string/app_name" />
-        <variable name="ACCOUNT_LABEL" value="@string/app_name" />
-        <variable name="ACCOUNT_TYPE" value="$PACKAGE_NAME.account" />
-        <variable name="CONTENT_AUTHORITY" value="$PACKAGE_NAME" />
-    </plugin>
     <plugin name="phonegap-plugin-push" spec="2.2.3">
         <variable name="SENDER_ID" value="893175418100" />
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
         <variable name="FCM_VERSION" value="11.6.2" />
     </plugin>
     <engine name="browser" spec="5.0.4" />
-    <engine name="android" spec="^7.1.4" />
 </widget>

package.json

@@ -12,7 +12,7 @@
     "build": "ionic build",
     "serve": "ionic build",
     "start": "npm run serve",
-    "prod_build": "ionic cordova build android --aot --minifyjs --minifycss --max-old-space-size=8192"
+    "prod_build": "ionic cordova build android --aot --minifyjs --minifycss --max-old-space-size=4096"
   },
   "dependencies": {
     "@angular/animations": "^5.1.1",
@@ -44,7 +44,7 @@
     "@types/chart.js": "^2.7.40",
     "amazon-cognito-identity-js": "^3.0.3",
     "chart.js": "^2.7.3",
-    "cordova-android": "^7.1.4",
+    "cordova-android": "8.0.0",
     "cordova-browser": "5.0.4",
     "cordova-plugin-android-permissions": "1.0.0",
     "cordova-plugin-app-version": "0.1.9",
@@ -55,12 +55,12 @@
     "cordova-plugin-geolocation": "2.4.3",
     "cordova-plugin-ionic-keyboard": "^2.0.5",
     "cordova-plugin-ionic-webview": "^2.0.0",
-    "cordova-plugin-mauron85-background-geolocation": "3.0.0-alpha.50",
+    "cordova-plugin-mauron85-background-geolocation": "3.0.1",
     "cordova-plugin-request-location-accuracy": "2.2.3",
     "cordova-plugin-splashscreen": "5.0.2",
     "cordova-plugin-statusbar": "2.4.2",
     "cordova-plugin-whitelist": "1.3.3",
-    "cordova-sqlite-storage": "2.6.0",
+    "cordova-sqlite-storage": "^3.2.1",
     "cordova-support-google-services": "1.1.0",
     "hammerjs": "^2.0.8",
     "increase-memory-limit": "^1.0.6",
@@ -105,8 +105,14 @@
         "GEOLOCATION_USAGE_DESCRIPTION": "To track your walks"
       },
       "cordova-plugin-request-location-accuracy": {},
-      "cordova-sqlite-storage": {},
       "cordova-plugin-android-permissions": {},
+      "phonegap-plugin-push": {
+        "SENDER_ID": "893175418100",
+        "ANDROID_SUPPORT_V13_VERSION": "27.+",
+        "FCM_VERSION": "11.6.2"
+      },
+      "cordova-plugin-app-version": {},
+      "cordova-sqlite-storage": {},
       "cordova-plugin-mauron85-background-geolocation": {
         "GOOGLE_PLAY_SERVICES_VERSION": "11+",
         "ANDROID_SUPPORT_LIBRARY_VERSION": "26+",
@@ -116,13 +122,7 @@
         "ACCOUNT_LABEL": "@string/app_name",
         "ACCOUNT_TYPE": "$PACKAGE_NAME.account",
         "CONTENT_AUTHORITY": "$PACKAGE_NAME"
-      },
-      "phonegap-plugin-push": {
-        "SENDER_ID": "893175418100",
-        "ANDROID_SUPPORT_V13_VERSION": "27.+",
-        "FCM_VERSION": "11.6.2"
-      },
-      "cordova-plugin-app-version": {}
+      }
     },
     "platforms": [
       "browser",

platforms/android/.gitignore

@@ -10,5 +10,12 @@ ant-gen
 # Eclipse builds
 gen
 out
-# Gradle builds
+# Gradle build artifacts
+.gradle
+.gradletasknamecache
 /build
+/CordovaLib/build
+/app/build
+gradle-app.setting
+# Android Studio
+.idea

platforms/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Jul 23 18:33:31 IST 2019
-gradle.version=4.1
+#Wed Jul 24 12:54:31 IST 2019
+gradle.version=4.10.3

platforms/android/CordovaLib/build.gradle

@@ -24,15 +24,15 @@ ext {
 
 buildscript {
     repositories {
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        // The gradle plugin and the maven plugin have to be updated after each version of Android
+        // studio comes out
+        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
@@ -42,12 +42,11 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 group = 'org.apache.cordova'
-version = '7.1.4'
+version = '8.0.0'
 
 android {
     compileSdkVersion cdvCompileSdkVersion
     buildToolsVersion cdvBuildToolsVersion
-    publishNonDefault true
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -94,9 +93,9 @@ install {
                     }
                 }
                 scm {
-                    connection 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
-                    developerConnection 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
-                    url 'https://git-wip-us.apache.org/repos/asf?p=cordova-android'
+                    connection 'scm:git:https://github.com/apache/cordova-android.git'
+                    developerConnection 'scm:git:git@github.com:apache/cordova-android.git'
+                    url 'https://github.com/apache/cordova-android'
 
                 }
             }
@@ -122,16 +121,16 @@ bintray {
         name = 'cordova-android'
         userOrg = 'cordova'
         licenses = ['Apache-2.0']
-        vcsUrl = 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
+        vcsUrl = 'https://github.com/apache/cordova-android'
         websiteUrl = 'https://cordova.apache.org'
-        issueTrackerUrl = 'https://issues.apache.org/jira/browse/CB'
+        issueTrackerUrl = 'https://github.com/apache/cordova-android/issues'
         publicDownloadNumbers = true
         licenses = ['Apache-2.0']
         labels = ['android', 'cordova', 'phonegap']
         version {
-            name = '7.1.4'
+            name = '8.0.0'
             released  = new Date()
-            vcsTag = '7.1.4'
+            vcsTag = '8.0.0'
         }
     }
 }

platforms/android/CordovaLib/build/generated/source/r/debug/org/apache/cordova/R.java

@@ -1,10 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * gradle plugin from the resource data it found. It
- * should not be modified by hand.
- */
-package org.apache.cordova;
-
-public final class R {
-}