Merge pull request #169 from prey/fix-message-in-lock

* Custom message fixed in Screen lock feature

app/build.gradle

@@ -4,16 +4,16 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 android {
 
-    compileSdkVersion 33
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "com.prey"
         minSdkVersion 21
 
-        targetSdkVersion 33
+        targetSdkVersion 32
 
-        versionCode 293
-        versionName '2.4.2'
+        versionCode 298
+        versionName '2.4.3'
 
         multiDexEnabled true
     }
@@ -38,21 +38,21 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    implementation 'com.google.android.material:material:1.6.1'
+    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:20.0.0'
+    implementation 'com.google.android.gms:play-services-location:21.0.0'
     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.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.0.6'
-    implementation 'com.google.firebase:firebase-analytics:21.1.0'
-    implementation 'com.google.firebase:firebase-crashlytics:18.2.12'
-    implementation 'com.google.firebase:firebase-database:20.0.5'
+    implementation 'com.google.firebase:firebase-messaging:23.1.0'
+    implementation 'com.google.firebase:firebase-analytics:21.2.0'
+    implementation 'com.google.firebase:firebase-crashlytics:18.3.1'
+    implementation 'com.google.firebase:firebase-database:20.1.0'
 
     implementation 'com.android.installreferrer:installreferrer:2.2'
     implementation 'com.android.support:multidex:1.0.3'

app/src/main/AndroidManifest.xml

@@ -34,9 +34,6 @@
     <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.2ed77530.chunk.css",
-  "main.js": "./static/js/main.f887ac75.chunk.js",
-  "main.js.map": "./static/js/main.f887ac75.chunk.js.map",
+  "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",
   "runtime~main.js": "./static/js/runtime~main.8c97409f.js",
   "runtime~main.js.map": "./static/js/runtime~main.8c97409f.js.map",
-  "static/js/2.7b5ddcdd.chunk.js": "./static/js/2.7b5ddcdd.chunk.js",
-  "static/js/2.7b5ddcdd.chunk.js.map": "./static/js/2.7b5ddcdd.chunk.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",
   "index.html": "./index.html",
-  "precache-manifest.410a8bdfaacf4413ba5f012e23a1ad3b.js": "./precache-manifest.410a8bdfaacf4413ba5f012e23a1ad3b.js",
+  "precache-manifest.4456f4c359f3e3defdd8550664c9e66e.js": "./precache-manifest.4456f4c359f3e3defdd8550664c9e66e.js",
   "service-worker.js": "./service-worker.js",
-  "static/css/main.2ed77530.chunk.css.map": "./static/css/main.2ed77530.chunk.css.map",
+  "static/css/main.b3971106.chunk.css.map": "./static/css/main.b3971106.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",

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.2ed77530.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.7b5ddcdd.chunk.js"></script><script src="./static/js/main.f887ac75.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.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>

app/src/main/assets/html/precache-manifest.410a8bdfaacf4413ba5f012e23a1ad3b.js → app/src/main/assets/html/precache-manifest.4456f4c359f3e3defdd8550664c9e66e.js

@@ -1,19 +1,19 @@
 self.__precacheManifest = [
   {
-    "revision": "f887ac758c0e50b8190a",
-    "url": "./static/css/main.2ed77530.chunk.css"
+    "revision": "62c5c13b3a64c8aa5762",
+    "url": "./static/css/main.b3971106.chunk.css"
   },
   {
-    "revision": "f887ac758c0e50b8190a",
-    "url": "./static/js/main.f887ac75.chunk.js"
+    "revision": "62c5c13b3a64c8aa5762",
+    "url": "./static/js/main.62c5c13b.chunk.js"
   },
   {
     "revision": "8c97409f0ee389fe75da",
     "url": "./static/js/runtime~main.8c97409f.js"
   },
   {
-    "revision": "7b5ddcdd4e7671550da0",
-    "url": "./static/js/2.7b5ddcdd.chunk.js"
+    "revision": "b482bf5694e2cda518c7",
+    "url": "./static/js/2.b482bf56.chunk.js"
   },
   {
     "revision": "c3679e2d8686db6f8013ffe2ad603c2c",
@@ -123,24 +123,24 @@ self.__precacheManifest = [
     "revision": "ada00d714f242a35966355f737998bb6",
     "url": "./static/media/fondo2.ada00d71.png"
   },
-  {
-    "revision": "6e8991140fc75b4927e2c440d9036429",
-    "url": "./static/media/regular-book-webfont.6e899114.woff"
-  },
   {
     "revision": "c44603b2b93c1b7a984f21255d556ee9",
     "url": "./static/media/magdaclean-regular-webfont.c44603b2.woff"
   },
   {
-    "revision": "baaac74770efd8c34382afa00468f635",
-    "url": "./static/media/magdaclean-bold-webfont.baaac747.woff"
+    "revision": "6e8991140fc75b4927e2c440d9036429",
+    "url": "./static/media/regular-book-webfont.6e899114.woff"
   },
   {
     "revision": "391159c582e0897e8d64ed22abe1ee2d",
     "url": "./static/media/regular-bold-webfont.391159c5.woff"
   },
   {
-    "revision": "07c40b64049c368ac952fdd5cd1455ec",
+    "revision": "baaac74770efd8c34382afa00468f635",
+    "url": "./static/media/magdaclean-bold-webfont.baaac747.woff"
+  },
+  {
+    "revision": "cac76481eda681ba5abd177a365613c5",
     "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.410a8bdfaacf4413ba5f012e23a1ad3b.js"
+  "./precache-manifest.4456f4c359f3e3defdd8550664c9e66e.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.2";
+    public static final String VERSION_PREY_DEFAULT = "2.4.3";
     // Milliseconds per second
     private static final int MILLISECONDS_PER_SECOND = 1000;
     // Set to 1000 * 60 in production.

app/src/main/java/com/prey/PreyPermission.java

@@ -74,14 +74,7 @@ public static boolean showRequestPhone(Activity activity) {
     }
 
     public static boolean canAccessStorage(Context ctx) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            return canPermissionGranted(ctx, android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
-        } else {
-            boolean image = canPermissionGranted(ctx, android.Manifest.permission.READ_MEDIA_IMAGES);
-            boolean audio = canPermissionGranted(ctx, android.Manifest.permission.READ_MEDIA_AUDIO);
-            boolean video = canPermissionGranted(ctx, android.Manifest.permission.READ_MEDIA_VIDEO);
-            return image && audio && video;
-        }
+        return canPermissionGranted(ctx, android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
     }
 
     public static boolean showRequestStorage(Activity activity) {

app/src/main/java/com/prey/actions/location/LocationUtil.java

@@ -172,7 +172,11 @@ public static PreyLocation getPreyLocationAppServiceOreo(final Context ctx, Stri
         PreyLocation preyLocation = null;
         Intent intentLocation = new Intent(ctx, LocationUpdatesService.class);
         try {
-            ctx.startService(intentLocation);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                ctx.startService(intentLocation);
+            } else {
+                ctx.startService(intentLocation);
+            }
             int i = 0;
             PreyLocationManager.getInstance(ctx).setLastLocation(null);
             while (i < MAXIMUM_OF_ATTEMPTS2) {

app/src/main/java/com/prey/activities/CheckPasswordHtmlActivity.java

@@ -245,12 +245,7 @@ public String getUrl(Context ctx) {
                                 PreyLogger.d(String.format("CheckPasswordHtmlActivity !canAccessBackgroundLocation"));
                                 url.append(URL_ONB).append("#/").append(lng).append("/bgloc");
                             } else {
-                                if (!isStorage) {
-                                    PreyLogger.d(String.format("CheckPasswordHtmlActivity !isStorage"));
-                                    url.append(URL_ONB).append("#/").append(lng).append("/allfiles");
-                                } else {
-                                    url.append(URL_ONB).append("#/").append(lng).append("/permissions");
-                                }
+                               url.append(URL_ONB).append("#/").append(lng).append("/permissions");
                             }
                         }
                     }else{
@@ -280,15 +275,6 @@ public String getUrl(Context ctx) {
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
     };
 
-    private static final String[] INITIAL_PERMS_TIRAMISU = {
-            Manifest.permission.ACCESS_COARSE_LOCATION,
-            Manifest.permission.ACCESS_FINE_LOCATION,
-            Manifest.permission.CAMERA,
-            Manifest.permission.READ_MEDIA_IMAGES,
-            Manifest.permission.READ_MEDIA_AUDIO,
-            Manifest.permission.READ_MEDIA_VIDEO
-    };
-
     @TargetApi(Build.VERSION_CODES.M)
     public void askForPermissionAndroid7() {
         PreyLogger.d("CheckPasswordHtmlActivity: askForPermissionAndroid7");
@@ -306,11 +292,7 @@ private void startOverlayService() {
     @TargetApi(Build.VERSION_CODES.M)
     public void askForPermission() {
         PreyLogger.d("CheckPasswordHtmlActivity askForPermission");
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            ActivityCompat.requestPermissions(CheckPasswordHtmlActivity.this, INITIAL_PERMS, REQUEST_PERMISSIONS);
-        }else {
-            ActivityCompat.requestPermissions(CheckPasswordHtmlActivity.this, INITIAL_PERMS_TIRAMISU, REQUEST_PERMISSIONS);
-        }
+        ActivityCompat.requestPermissions(CheckPasswordHtmlActivity.this, INITIAL_PERMS, REQUEST_PERMISSIONS);
     }
 
     public void deniedPermission() {

app/src/main/java/com/prey/managers/PreyConnectivityManager.java

@@ -9,6 +9,8 @@
 import android.content.Context;
 import android.net.ConnectivityManager;
 
+import com.prey.PreyLogger;
+
 public class PreyConnectivityManager {
 
     private ConnectivityManager connectivity = null;
@@ -78,8 +80,13 @@ public boolean isWifiAvailable(){
     }
 
     public boolean isWifiConnected(){
-        android.net.NetworkInfo wifi =connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-        return wifi.isConnected();
+        try {
+            android.net.NetworkInfo wifi = connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+            return wifi.isConnected();
+        } catch (Exception e) {
+            PreyLogger.d("Error isWifiConnected:" + e.getMessage());
+            return false;
+        }
     }
 
 }