Merge pull request #175 from prey/fix/a-single-notification-on-location

Fix/a single notification on location
prey · Jul 21, 2023 · 62052da · 62052da
2 parents 61bb1f7 + 8c9bacf
commit 62052da
Show file tree

Hide file tree

Showing 25 changed files with 784 additions and 351 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
 
         targetSdkVersion 33
 
-        versionCode 314
-        versionName '2.4.8'
+        versionCode 316
+        versionName '2.4.9'
 
         multiDexEnabled true
     }
@@ -42,18 +42,18 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
     implementation 'com.google.android.gms:play-services-location:21.0.1'
     implementation 'com.google.android.gms:play-services-gcm:17.0.0'
     implementation 'com.google.android.gms:play-services-vision:20.1.3'
     implementation 'com.google.android.gms:play-services-maps:18.1.0'
     implementation 'com.google.firebase:firebase-core:21.1.1'
     implementation 'com.google.firebase:firebase-iid:21.1.0'
-    implementation 'com.google.firebase:firebase-messaging:23.1.2'
-    implementation 'com.google.firebase:firebase-analytics:21.2.0'
-    implementation 'com.google.firebase:firebase-crashlytics:18.3.5'
-    implementation 'com.google.firebase:firebase-database:20.1.0'
+    implementation 'com.google.firebase:firebase-messaging:23.2.0'
+    implementation 'com.google.firebase:firebase-analytics:21.3.0'
+    implementation 'com.google.firebase:firebase-crashlytics:18.4.0'
+    implementation 'com.google.firebase:firebase-database:20.2.2'
 
     implementation 'com.android.installreferrer:installreferrer:2.2'
     implementation 'com.android.support:multidex:1.0.3'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -59,6 +59,7 @@
 
     <uses-permission android:name="android.permission.USES_POLICY_FORCE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-feature
         android:glEsVersion="0x00020000"

diff --git a/app/src/main/assets/html/asset-manifest.json b/app/src/main/assets/html/asset-manifest.json
@@ -1,13 +1,13 @@
 {
   "main.css": "./static/css/main.cfa80321.chunk.css",
-  "main.js": "./static/js/main.2cd5e5a2.chunk.js",
-  "main.js.map": "./static/js/main.2cd5e5a2.chunk.js.map",
+  "main.js": "./static/js/main.d0b4e24f.chunk.js",
+  "main.js.map": "./static/js/main.d0b4e24f.chunk.js.map",
   "runtime~main.js": "./static/js/runtime~main.8c97409f.js",
   "runtime~main.js.map": "./static/js/runtime~main.8c97409f.js.map",
   "static/js/2.d9125aad.chunk.js": "./static/js/2.d9125aad.chunk.js",
   "static/js/2.d9125aad.chunk.js.map": "./static/js/2.d9125aad.chunk.js.map",
   "index.html": "./index.html",
-  "precache-manifest.c571125ebf6ad31ab1b7032df34005d8.js": "./precache-manifest.c571125ebf6ad31ab1b7032df34005d8.js",
+  "precache-manifest.41cfb20e9ef783cbd3aeed30e507a89b.js": "./precache-manifest.41cfb20e9ef783cbd3aeed30e507a89b.js",
   "service-worker.js": "./service-worker.js",
   "static/css/main.cfa80321.chunk.css.map": "./static/css/main.cfa80321.chunk.css.map",
   "static/media/02-Track-Find.png": "./static/media/02-Track-Find.ed00c298.png",

diff --git a/app/src/main/assets/html/index.html b/app/src/main/assets/html/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"/><meta name="apple-mobile-web-app-capable" content="yes"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><title>Prey Client</title><link href="./static/css/main.cfa80321.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="./";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="./static/js/2.d9125aad.chunk.js"></script><script src="./static/js/main.2cd5e5a2.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"/><meta name="apple-mobile-web-app-capable" content="yes"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><title>Prey Client</title><link href="./static/css/main.cfa80321.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="./";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="./static/js/2.d9125aad.chunk.js"></script><script src="./static/js/main.d0b4e24f.chunk.js"></script></body></html>
diff --git a/...ifest.c571125ebf6ad31ab1b7032df34005d8.js → ...ifest.41cfb20e9ef783cbd3aeed30e507a89b.js b/...ifest.c571125ebf6ad31ab1b7032df34005d8.js → ...ifest.41cfb20e9ef783cbd3aeed30e507a89b.js
@@ -1,11 +1,11 @@
 self.__precacheManifest = [
   {
-    "revision": "2cd5e5a283ebf98ea08a",
+    "revision": "d0b4e24f0f6d76434e18",
     "url": "./static/css/main.cfa80321.chunk.css"
   },
   {
-    "revision": "2cd5e5a283ebf98ea08a",
-    "url": "./static/js/main.2cd5e5a2.chunk.js"
+    "revision": "d0b4e24f0f6d76434e18",
+    "url": "./static/js/main.d0b4e24f.chunk.js"
   },
   {
     "revision": "8c97409f0ee389fe75da",
@@ -120,8 +120,8 @@ self.__precacheManifest = [
     "url": "./static/media/fondo2.ada00d71.png"
   },
   {
-    "revision": "baaac74770efd8c34382afa00468f635",
-    "url": "./static/media/magdaclean-bold-webfont.baaac747.woff"
+    "revision": "c44603b2b93c1b7a984f21255d556ee9",
+    "url": "./static/media/magdaclean-regular-webfont.c44603b2.woff"
   },
   {
     "revision": "6e8991140fc75b4927e2c440d9036429",
@@ -132,11 +132,11 @@ self.__precacheManifest = [
     "url": "./static/media/regular-bold-webfont.391159c5.woff"
   },
   {
-    "revision": "c44603b2b93c1b7a984f21255d556ee9",
-    "url": "./static/media/magdaclean-regular-webfont.c44603b2.woff"
+    "revision": "baaac74770efd8c34382afa00468f635",
+    "url": "./static/media/magdaclean-bold-webfont.baaac747.woff"
   },
   {
-    "revision": "c5250d353970dfbeee3b848170aa1f31",
+    "revision": "b64cf56cd685186f876003de76209dce",
     "url": "./index.html"
   }
 ];
diff --git a/app/src/main/assets/html/service-worker.js b/app/src/main/assets/html/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
 
 importScripts(
-  "./precache-manifest.c571125ebf6ad31ab1b7032df34005d8.js"
+  "./precache-manifest.41cfb20e9ef783cbd3aeed30e507a89b.js"
 );
 
 workbox.clientsClaim();

diff --git a/app/src/main/assets/html/static/js/main.2cd5e5a2.chunk.js b/app/src/main/assets/html/static/js/main.2cd5e5a2.chunk.js
diff --git a/app/src/main/assets/html/static/js/main.2cd5e5a2.chunk.js.map b/app/src/main/assets/html/static/js/main.2cd5e5a2.chunk.js.map
diff --git a/app/src/main/assets/html/static/js/main.d0b4e24f.chunk.js b/app/src/main/assets/html/static/js/main.d0b4e24f.chunk.js
diff --git a/app/src/main/assets/html/static/js/main.d0b4e24f.chunk.js.map b/app/src/main/assets/html/static/js/main.d0b4e24f.chunk.js.map
diff --git a/app/src/main/java/com/prey/PreyConfig.java b/app/src/main/java/com/prey/PreyConfig.java
@@ -41,7 +41,7 @@ public class PreyConfig {
     private static PreyConfig cachedInstance = null;
     public static final String TAG = "PREY";
     private static final String HTTP = "https://";
-    public static final String VERSION_PREY_DEFAULT = "2.4.8";
+    public static final String VERSION_PREY_DEFAULT = "2.4.9";
     // Milliseconds per second
     private static final int MILLISECONDS_PER_SECOND = 1000;
     // Set to 1000 * 60 in production.
@@ -177,6 +177,9 @@ public class PreyConfig {
     public static final String MSP_ACCOUNT = "MSP_ACCOUNT";
     public static final String START = "START";
 
+    public static final String VOLUME= "VOLUME";
+    public static final String DENY_NOTIFICATION= "DENY_NOTIFICATION";
+    public static final String TIME_NEXT_PING = "TIME_NEXT_PING";
     private boolean securityPrivilegesAlreadyPrompted;
     private Context ctx;
     public static String postUrl = null;
@@ -1528,4 +1531,48 @@ public boolean getStart() {
     public void setStart(boolean start) {
         saveBoolean(PreyConfig.START, start);
     }
+
+    public void setTimeNextPing() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.add(Calendar.MINUTE, 1);
+        saveLong(TIME_NEXT_PING, cal.getTimeInMillis());
+    }
+
+    /**
+     * Method that returns if I should verify the internet with ping
+     *
+     * @return if check
+     */
+    public boolean isTimeNextPing() {
+        long timePing = getLong(TIME_NEXT_PING, 0);
+        long timeNow = new Date().getTime();
+        return timeNow < timePing;
+    }
+
+    public void setVolume(int volume) {
+        saveInt(PreyConfig.VOLUME, volume);
+    }
+
+    /**
+     * Method that returns the volume before the report
+     *
+     * @return volume
+     */
+    public int getVolume() {
+        return getInt(PreyConfig.VOLUME, 0);
+    }
+
+    public void setDenyNotification(boolean denyNotification) {
+        this.saveBoolean(PreyConfig.DENY_NOTIFICATION, denyNotification);
+    }
+
+    /**
+     * Method to deny notification permission
+     *
+     * @return denied
+     */
+    public boolean getDenyNotification() {
+        return getBoolean(PreyConfig.DENY_NOTIFICATION, false);
+    }
 }