Skip to content

Commit

Permalink
Merge pull request #158 from prey/message-in-lock
Browse files Browse the repository at this point in the history
  • Loading branch information
oaliaga authored Jun 30, 2021
2 parents 8f9c780 + 07bf542 commit 98a563a
Show file tree
Hide file tree
Showing 22 changed files with 81 additions and 80 deletions.
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {

targetSdkVersion 30

versionCode 247
versionName '2.3.6'
versionCode 250
versionName '2.3.7'

multiDexEnabled true
}
Expand All @@ -38,7 +38,7 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

implementation 'com.google.android.material:material:1.3.0'
Expand All @@ -47,12 +47,12 @@ dependencies {
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:17.0.1'
implementation 'com.google.firebase:firebase-core:18.0.3'
implementation 'com.google.firebase:firebase-core:19.0.0'
implementation 'com.google.firebase:firebase-iid:21.1.0'
implementation 'com.google.firebase:firebase-messaging:21.1.0'
implementation 'com.google.firebase:firebase-analytics:18.0.3'
implementation 'com.google.firebase:firebase-crashlytics:17.4.1'
implementation 'com.google.firebase:firebase-database:19.7.0'
implementation 'com.google.firebase:firebase-messaging:22.0.0'
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-crashlytics:18.1.0'
implementation 'com.google.firebase:firebase-database:20.0.0'

implementation 'com.android.installreferrer:installreferrer:2.2'
implementation 'com.android.support:multidex:1.0.3'
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/assets/html/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"main.css": "./static/css/main.7c155169.chunk.css",
"main.js": "./static/js/main.88200d45.chunk.js",
"main.js.map": "./static/js/main.88200d45.chunk.js.map",
"main.css": "./static/css/main.104a486e.chunk.css",
"main.js": "./static/js/main.38f962d2.chunk.js",
"main.js.map": "./static/js/main.38f962d2.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.0139e727.chunk.js": "./static/js/2.0139e727.chunk.js",
"static/js/2.0139e727.chunk.js.map": "./static/js/2.0139e727.chunk.js.map",
"static/js/2.637a8e7e.chunk.js": "./static/js/2.637a8e7e.chunk.js",
"static/js/2.637a8e7e.chunk.js.map": "./static/js/2.637a8e7e.chunk.js.map",
"index.html": "./index.html",
"precache-manifest.2c138acfa20e8f53c02ca0a959b930ce.js": "./precache-manifest.2c138acfa20e8f53c02ca0a959b930ce.js",
"precache-manifest.c88b1c09787536be796a85467f1faad6.js": "./precache-manifest.c88b1c09787536be796a85467f1faad6.js",
"service-worker.js": "./service-worker.js",
"static/css/main.7c155169.chunk.css.map": "./static/css/main.7c155169.chunk.css.map",
"static/css/main.104a486e.chunk.css.map": "./static/css/main.104a486e.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",
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/assets/html/index.html
Original file line number Diff line number Diff line change
@@ -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"/><link rel="manifest" href="./manifest.json"/><title>Prey Client</title><link href="./static/css/main.7c155169.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.0139e727.chunk.js"></script><script src="./static/js/main.88200d45.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.104a486e.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.637a8e7e.chunk.js"></script><script src="./static/js/main.38f962d2.chunk.js"></script></body></html>
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
self.__precacheManifest = [
{
"revision": "88200d459cb19ae67602",
"url": "./static/css/main.7c155169.chunk.css"
"revision": "38f962d28fbd679b1e1c",
"url": "./static/css/main.104a486e.chunk.css"
},
{
"revision": "88200d459cb19ae67602",
"url": "./static/js/main.88200d45.chunk.js"
"revision": "38f962d28fbd679b1e1c",
"url": "./static/js/main.38f962d2.chunk.js"
},
{
"revision": "8c97409f0ee389fe75da",
"url": "./static/js/runtime~main.8c97409f.js"
},
{
"revision": "0139e727e1459130bf28",
"url": "./static/js/2.0139e727.chunk.js"
"revision": "637a8e7e2ac2a5e42bef",
"url": "./static/js/2.637a8e7e.chunk.js"
},
{
"revision": "c3679e2d8686db6f8013ffe2ad603c2c",
Expand Down Expand Up @@ -123,20 +123,20 @@ self.__precacheManifest = [
"revision": "6e8991140fc75b4927e2c440d9036429",
"url": "./static/media/regular-book-webfont.6e899114.woff"
},
{
"revision": "baaac74770efd8c34382afa00468f635",
"url": "./static/media/magdaclean-bold-webfont.baaac747.woff"
},
{
"revision": "391159c582e0897e8d64ed22abe1ee2d",
"url": "./static/media/regular-bold-webfont.391159c5.woff"
},
{
"revision": "baaac74770efd8c34382afa00468f635",
"url": "./static/media/magdaclean-bold-webfont.baaac747.woff"
},
{
"revision": "c44603b2b93c1b7a984f21255d556ee9",
"url": "./static/media/magdaclean-regular-webfont.c44603b2.woff"
},
{
"revision": "9d745610a72faf083c7fe6b56abeffa0",
"revision": "45ced7ded14ae220febed2c0e161271e",
"url": "./index.html"
}
];
2 changes: 1 addition & 1 deletion app/src/main/assets/html/service-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");

importScripts(
"./precache-manifest.2c138acfa20e8f53c02ca0a959b930ce.js"
"./precache-manifest.c88b1c09787536be796a85467f1faad6.js"
);

workbox.clientsClaim();
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion app/src/main/assets/html/static/js/2.0139e727.chunk.js.map

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/src/main/assets/html/static/js/2.637a8e7e.chunk.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/src/main/assets/html/static/js/main.38f962d2.chunk.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions app/src/main/assets/html/static/js/main.88200d45.chunk.js

This file was deleted.

This file was deleted.

9 changes: 9 additions & 0 deletions app/src/main/java/com/prey/PreyConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public class PreyConfig {
public static final String MESSAGE_ID="messageID";
public static final String JOB_ID="device_job_id";
public static final String UNLOCK_PASS="unlock_pass";
public static final String LOCK_MESSAGE="lock_message";
public static final String NOTIFICATION_ANDROID_7="notify_android_7";
public static final String JOB_ID_LOCK="job_id_lock";
public static final String COUNTER_OFF="counter_off";
Expand Down Expand Up @@ -427,6 +428,14 @@ public void setUnlockPass(String unlockPass){
this.saveString(PreyConfig.UNLOCK_PASS, unlockPass);
}

public String getLockMessage(){
return getString(PreyConfig.LOCK_MESSAGE, null);
}

public void setLockMessage(String unlockPass){
this.saveString(PreyConfig.LOCK_MESSAGE, unlockPass);
}

public void deleteUnlockPass(){
this.removeKey(PreyConfig.UNLOCK_PASS);
}
Expand Down
8 changes: 0 additions & 8 deletions app/src/main/java/com/prey/PreyPermission.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,6 @@ public static boolean showRequestCamera(Activity activity) {
return shouldShowRequestPermission(activity,android.Manifest.permission.CAMERA);
}

public static boolean canAccessPhone(Context ctx) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
return true;
}else{
return canPermissionGranted(ctx,android.Manifest.permission.READ_PHONE_STATE);
}
}

public static boolean showRequestPhone(Activity activity) {
return shouldShowRequestPermission(activity,android.Manifest.permission.READ_PHONE_STATE);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,6 @@ public void deniedPermission() {
permission += ", ";
permission += this.getString(R.string.permission_camera);
}
boolean canAccessReadPhoneState = PreyPermission.canAccessPhone(this);
if(!canAccessReadPhoneState) {
if(!"".equals(permission))
permission += ", ";
permission += this.getString(R.string.permission_phone);
}
boolean canAccessWriteExternalStorage = PreyPermission.canAccessStorage(this);
if(!canAccessWriteExternalStorage) {
if(!"".equals(permission))
Expand Down Expand Up @@ -354,10 +348,9 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
boolean canAccessFineLocation = PreyPermission.canAccessFineLocation(this);
boolean canAccessCoarseLocation = PreyPermission.canAccessCoarseLocation(this);
boolean canAccessCamera = PreyPermission.canAccessCamera(this);
boolean canAccessPhone = PreyPermission.canAccessPhone(this);
boolean canAccessStorage = PreyPermission.canAccessStorage(this);
if (canAccessFineLocation && canAccessCoarseLocation && canAccessCamera
&& canAccessPhone && canAccessStorage ) {
&& canAccessStorage ) {
PreyLogger.d("CheckPasswordHtmlActivity: onRequestPermissionsResult 1");
boolean canDrawOverlays = PreyPermission.canDrawOverlays(this);
if (!canDrawOverlays) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@ private void showScreen() {
boolean canAccessFineLocation = PreyPermission.canAccessFineLocation(this);
boolean canAccessCoarseLocation = PreyPermission.canAccessCoarseLocation(this);
boolean canAccessCamera = PreyPermission.canAccessCamera(this);
boolean canAccessPhone = PreyPermission.canAccessPhone(this);
boolean canAccessStorage = PreyPermission.canAccessStorage(this);
boolean configurated=canAccessFineLocation&&canAccessCoarseLocation && canAccessCamera
&& canAccessPhone && canAccessStorage ;
&& canAccessStorage ;
if(!configurated){
askForPermission();
}
Expand Down Expand Up @@ -135,10 +134,9 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
boolean canAccessFineLocation = PreyPermission.canAccessFineLocation(this);
boolean canAccessCoarseLocation = PreyPermission.canAccessCoarseLocation(this);
boolean canAccessCamera = PreyPermission.canAccessCamera(this);
boolean canAccessPhone = PreyPermission.canAccessPhone(this);
boolean canAccessStorage = PreyPermission.canAccessStorage(this);
if (canAccessFineLocation && canAccessCoarseLocation && canAccessCamera
&& canAccessPhone && canAccessStorage ) {
&& canAccessStorage ) {
boolean canDrawOverlays = PreyPermission.canDrawOverlays(this);
if (!canDrawOverlays) {
askForPermissionAndroid7();
Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/com/prey/activities/js/WebAppInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,6 @@ public boolean initCamera() {
return PreyPermission.canAccessCamera(mContext);
}

@JavascriptInterface
public boolean initReadPhone() {
return PreyPermission.canAccessPhone(mContext);
}

@JavascriptInterface
public boolean initWriteStorage() {
return PreyPermission.canAccessStorage(mContext);
Expand Down Expand Up @@ -888,4 +883,10 @@ public void skipPermissionsBg(){
PreyLogger.d("skipPermissionsBg");
}

@JavascriptInterface
public String verificateAlert(){
String verificateAlert = PreyConfig.getPreyConfig(mContext).getLockMessage();
PreyLogger.d("verificateAlert:["+verificateAlert+"]");
return verificateAlert;
}
}
Loading

0 comments on commit 98a563a

Please sign in to comment.