Merge pull request #170 from prey/api33

Api33

app/build.gradle

@@ -4,16 +4,16 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 android {
 
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.prey"
         minSdkVersion 21
 
-        targetSdkVersion 32
+        targetSdkVersion 33
 
-        versionCode 298
-        versionName '2.4.3'
+        versionCode 309
+        versionName '2.4.5'
 
         multiDexEnabled true
     }
@@ -29,29 +29,30 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
-    lintOptions {
-        checkReleaseBuilds false
+    lint {
         abortOnError false
+        checkReleaseBuilds false
     }
+    namespace 'com.prey'
 }
 
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
-    implementation 'com.google.android.gms:play-services-location:21.0.0'
+    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.0'
+    implementation 'com.google.firebase:firebase-messaging:23.1.1'
     implementation 'com.google.firebase:firebase-analytics:21.2.0'
-    implementation 'com.google.firebase:firebase-crashlytics:18.3.1'
+    implementation 'com.google.firebase:firebase-crashlytics:18.3.3'
     implementation 'com.google.firebase:firebase-database:20.1.0'
 
     implementation 'com.android.installreferrer:installreferrer:2.2'

app/src/main/AndroidManifest.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.prey"
+    xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="internalOnly"
   >
 
-
     <uses-feature android:name="android.hardware.location.network" android:required="true" />
     <uses-feature android:name="android.hardware.telephony" android:required="false" />
     <uses-feature android:name="android.hardware.location" android:required="true" />
@@ -18,6 +18,8 @@
 
     <uses-feature android:name="android.hardware.microphone" android:required="false" />
 
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR"/>
 
@@ -34,6 +36,9 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

app/src/main/assets/html/asset-manifest.json

@@ -1,15 +1,15 @@
 {
-  "main.css": "./static/css/main.b3971106.chunk.css",
-  "main.js": "./static/js/main.62c5c13b.chunk.js",
-  "main.js.map": "./static/js/main.62c5c13b.chunk.js.map",
+  "main.css": "./static/css/main.cfa80321.chunk.css",
+  "main.js": "./static/js/main.1bcccd0c.chunk.js",
+  "main.js.map": "./static/js/main.1bcccd0c.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.b482bf56.chunk.js": "./static/js/2.b482bf56.chunk.js",
-  "static/js/2.b482bf56.chunk.js.map": "./static/js/2.b482bf56.chunk.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.4456f4c359f3e3defdd8550664c9e66e.js": "./precache-manifest.4456f4c359f3e3defdd8550664c9e66e.js",
+  "precache-manifest.9dcf66ccb319bb2a066089692eb34c28.js": "./precache-manifest.9dcf66ccb319bb2a066089692eb34c28.js",
   "service-worker.js": "./service-worker.js",
-  "static/css/main.b3971106.chunk.css.map": "./static/css/main.b3971106.chunk.css.map",
+  "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",
   "static/media/03-React-Protect.png": "./static/media/03-React-Protect.abee7ee7.png",
   "static/media/04-Evidencev.png": "./static/media/04-Evidencev.6dd5ae67.png",
@@ -19,7 +19,6 @@
   "static/media/1_security-hub-06.png": "./static/media/1_security-hub-06.65fc5e65.png",
   "static/media/fondo1.png": "./static/media/fondo1.e8c057a4.png",
   "static/media/fondo2.png": "./static/media/fondo2.ada00d71.png",
-  "static/media/ico-help.svg": "./static/media/ico-help.20155d96.svg",
   "static/media/icons.eot": "./static/media/icons.0169ebee.eot",
   "static/media/icons.ttf": "./static/media/icons.1f78a8d8.ttf",
   "static/media/icons.woff": "./static/media/icons.22dd050a.woff",

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.b3971106.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.b482bf56.chunk.js"></script><script src="./static/js/main.62c5c13b.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.1bcccd0c.chunk.js"></script></body></html>

app/src/main/assets/html/precache-manifest.4456f4c359f3e3defdd8550664c9e66e.js → app/src/main/assets/html/precache-manifest.9dcf66ccb319bb2a066089692eb34c28.js

@@ -1,19 +1,19 @@
 self.__precacheManifest = [
   {
-    "revision": "62c5c13b3a64c8aa5762",
-    "url": "./static/css/main.b3971106.chunk.css"
+    "revision": "1bcccd0cd81558f553f4",
+    "url": "./static/css/main.cfa80321.chunk.css"
   },
   {
-    "revision": "62c5c13b3a64c8aa5762",
-    "url": "./static/js/main.62c5c13b.chunk.js"
+    "revision": "1bcccd0cd81558f553f4",
+    "url": "./static/js/main.1bcccd0c.chunk.js"
   },
   {
     "revision": "8c97409f0ee389fe75da",
     "url": "./static/js/runtime~main.8c97409f.js"
   },
   {
-    "revision": "b482bf5694e2cda518c7",
-    "url": "./static/js/2.b482bf56.chunk.js"
+    "revision": "d9125aade798dfff92ba",
+    "url": "./static/js/2.d9125aad.chunk.js"
   },
   {
     "revision": "c3679e2d8686db6f8013ffe2ad603c2c",
@@ -87,10 +87,6 @@ self.__precacheManifest = [
     "revision": "2f54fbbdcc5379a2bed9d6e2225bb646",
     "url": "./static/media/icons.2f54fbbd.svg"
   },
-  {
-    "revision": "20155d963e7854778195e4f24cd3b77b",
-    "url": "./static/media/ico-help.20155d96.svg"
-  },
   {
     "revision": "def820f56f913fec31fcf511e6cd24f0",
     "url": "./static/media/05-Location.def820f5.png"
@@ -123,14 +119,14 @@ self.__precacheManifest = [
     "revision": "ada00d714f242a35966355f737998bb6",
     "url": "./static/media/fondo2.ada00d71.png"
   },
-  {
-    "revision": "c44603b2b93c1b7a984f21255d556ee9",
-    "url": "./static/media/magdaclean-regular-webfont.c44603b2.woff"
-  },
   {
     "revision": "6e8991140fc75b4927e2c440d9036429",
     "url": "./static/media/regular-book-webfont.6e899114.woff"
   },
+  {
+    "revision": "c44603b2b93c1b7a984f21255d556ee9",
+    "url": "./static/media/magdaclean-regular-webfont.c44603b2.woff"
+  },
   {
     "revision": "391159c582e0897e8d64ed22abe1ee2d",
     "url": "./static/media/regular-bold-webfont.391159c5.woff"
@@ -140,7 +136,7 @@ self.__precacheManifest = [
     "url": "./static/media/magdaclean-bold-webfont.baaac747.woff"
   },
   {
-    "revision": "cac76481eda681ba5abd177a365613c5",
+    "revision": "4dbd0e1b75d7968d319f8083579da66d",
     "url": "./index.html"
   }
 ];

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.4456f4c359f3e3defdd8550664c9e66e.js"
+  "./precache-manifest.9dcf66ccb319bb2a066089692eb34c28.js"
 );
 
 workbox.clientsClaim();

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.3";
+    public static final String VERSION_PREY_DEFAULT = "2.4.5";
     // Milliseconds per second
     private static final int MILLISECONDS_PER_SECOND = 1000;
     // Set to 1000 * 60 in production.
@@ -145,6 +145,7 @@ public class PreyConfig {
     public static final String PUBLIC_IP = "PUBLIC_IP";
     public static final String LOCATION_LAT = "LOCATION_LAT";
     public static final String LOCATION_LNG = "LOCATION_LNG";
+    public static final String LOCATION_ACCURACY = "LOCATION_ACCURACY";
     public static final String AWARE_LAT = "AWARE_LAT";
     public static final String AWARE_LNG = "AWARE_LNG";
     public static final String AWARE_ACC = "AWARE_ACC";
@@ -173,6 +174,7 @@ public class PreyConfig {
     public static final String ALLFILES_DENIED = "ALLFILES_DENIED";
     public static final String TIME_NEXT_LOCATIONBG = "TIME_NEXT_LOCATIONBG";
     public static final String LOCATIONBG_DENIED = "LOCATIONBG_DENIED";
+    public static final String MSP_ACCOUNT = "MSP_ACCOUNT";
 
     private boolean securityPrivilegesAlreadyPrompted;
     private Context ctx;
@@ -1086,14 +1088,17 @@ public void setLocation(PreyLocation location){
         if(location!=null) {
             saveFloat(PreyConfig.LOCATION_LAT, (float) location.getLat().floatValue());
             saveFloat(PreyConfig.LOCATION_LNG, (float) location.getLng().floatValue());
+            saveFloat(PreyConfig.LOCATION_ACCURACY, (float) location.getAccuracy());
         }
     }
     public PreyLocation getLocation(){
         PreyLocation location=new PreyLocation();
-        float lat= getFloat(PreyConfig.LOCATION_LAT ,0);
-        float lng= getFloat(PreyConfig.LOCATION_LNG,0 );
+        float lat = getFloat(PreyConfig.LOCATION_LAT, 0);
+        float lng = getFloat(PreyConfig.LOCATION_LNG, 0);
+        float accuracy = getFloat(PreyConfig.LOCATION_ACCURACY, 0);
         location.setLat(lat);
         location.setLng(lng);
+        location.setAccuracy(accuracy);
         return location;
     }
 
@@ -1507,4 +1512,12 @@ public boolean getLocationBgDenied() {
         return getBoolean(PreyConfig.LOCATIONBG_DENIED, false);
     }
 
+    public boolean getMspAccount() {
+        return getBoolean(PreyConfig.MSP_ACCOUNT, false);
+    }
+
+    public void setMspAccount(boolean mspAccount) {
+        saveBoolean(PreyConfig.MSP_ACCOUNT, mspAccount);
+    }
+
 }