Merge pull request #157 from prey/accessibility3

Accessibility3

app/build.gradle

@@ -12,8 +12,8 @@ android {
 
         targetSdkVersion 30
 
-        versionCode 235
-        versionName '2.3.4'
+        versionCode 247
+        versionName '2.3.6'
 
         multiDexEnabled true
     }
@@ -25,12 +25,17 @@ android {
     }
     productFlavors {
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
     lintOptions {
         checkReleaseBuilds false
         abortOnError false
     }
 }
 
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -41,14 +46,14 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:18.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:17.0.0'
-    implementation 'com.google.firebase:firebase-core:18.0.2'
-    implementation 'com.google.firebase:firebase-iid:21.0.1'
-    implementation 'com.google.firebase:firebase-messaging:21.0.1'
-    implementation 'com.google.firebase:firebase-analytics:18.0.2'
-    implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
-    implementation 'com.google.firebase:firebase-database:19.6.0'
-    implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
+    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-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.android.installreferrer:installreferrer:2.2'
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'com.google.code.gson:gson:2.8.6'

app/src/main/AndroidManifest.xml

@@ -407,15 +407,14 @@
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="true"/>
 
-        <!--
         <service android:name="com.prey.services.PreyAccessibilityService" />
         <service android:name="com.prey.services.AppAccessibilityService" android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE" android:enabled="true">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService"/>
             </intent-filter>
             <meta-data android:name="android.accessibilityservice" android:resource="@xml/accessibilityservice"/>
         </service>
-        -->
+
     </application>
 
 </manifest>

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

@@ -1,13 +1,13 @@
 {
   "main.css": "./static/css/main.7c155169.chunk.css",
-  "main.js": "./static/js/main.4cce660b.chunk.js",
-  "main.js.map": "./static/js/main.4cce660b.chunk.js.map",
+  "main.js": "./static/js/main.88200d45.chunk.js",
+  "main.js.map": "./static/js/main.88200d45.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",
   "index.html": "./index.html",
-  "precache-manifest.cf35e7653b09d3971c95a3c614660fb9.js": "./precache-manifest.cf35e7653b09d3971c95a3c614660fb9.js",
+  "precache-manifest.2c138acfa20e8f53c02ca0a959b930ce.js": "./precache-manifest.2c138acfa20e8f53c02ca0a959b930ce.js",
   "service-worker.js": "./service-worker.js",
   "static/css/main.7c155169.chunk.css.map": "./static/css/main.7c155169.chunk.css.map",
   "static/media/02-Track-Find.png": "./static/media/02-Track-Find.ed00c298.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"/><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.4cce660b.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"/><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>

app/src/main/assets/html/precache-manifest.cf35e7653b09d3971c95a3c614660fb9.js → app/src/main/assets/html/precache-manifest.2c138acfa20e8f53c02ca0a959b930ce.js

@@ -1,11 +1,11 @@
 self.__precacheManifest = [
   {
-    "revision": "4cce660ba505cea8196e",
+    "revision": "88200d459cb19ae67602",
     "url": "./static/css/main.7c155169.chunk.css"
   },
   {
-    "revision": "4cce660ba505cea8196e",
-    "url": "./static/js/main.4cce660b.chunk.js"
+    "revision": "88200d459cb19ae67602",
+    "url": "./static/js/main.88200d45.chunk.js"
   },
   {
     "revision": "8c97409f0ee389fe75da",
@@ -136,7 +136,7 @@ self.__precacheManifest = [
     "url": "./static/media/magdaclean-regular-webfont.c44603b2.woff"
   },
   {
-    "revision": "65b43d333a3341a810c948b940f6155a",
+    "revision": "9d745610a72faf083c7fe6b56abeffa0",
     "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.cf35e7653b09d3971c95a3c614660fb9.js"
+  "./precache-manifest.2c138acfa20e8f53c02ca0a959b930ce.js"
 );
 
 workbox.clientsClaim();

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

@@ -81,5 +81,4 @@ public boolean isMissing() {
         return missing;
     }
 
-}
-
+}

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

@@ -22,6 +22,7 @@
 import com.prey.actions.report.ReportScheduled;
 import com.prey.actions.triggers.TriggerController;
 import com.prey.activities.LoginActivity;
+import com.prey.beta.actions.PreyBetaController;
 import com.prey.events.factories.EventFactory;
 import com.prey.events.receivers.EventReceiver;
 import com.prey.net.PreyWebServices;
@@ -55,14 +56,16 @@ public void onCreate() {
                 getApplicationContext().startActivity(intent);
             }
         } catch (Exception e) {
+            PreyLogger.e("Error call intent LoginActivity:"+e.getMessage(),e);
         }
         run(this);
         runReceiver(this);
         try {
             FirebaseApp.initializeApp(this);
         } catch (Exception e) {
-            PreyLogger.e("Error PreyApp:" + e.getMessage(), e);
+            PreyLogger.e("Error FirebaseApp:" + e.getMessage(), e);
         }
+        PreyBetaController.startPrey(getApplicationContext());
     }
 
     public void run(final Context ctx) {
@@ -81,51 +84,32 @@ public void run(final Context ctx) {
             PreyLogger.d("InstallationDate:" + PreyConfig.getPreyConfig(ctx).getInstallationDate());
             if (PreyConfig.getPreyConfig(ctx).getInstallationDate() == 0) {
                 PreyConfig.getPreyConfig(ctx).setInstallationDate(new Date().getTime());
-                PreyWebServices.getInstance().sendEvent(ctx, PreyConfig.ANDROID_INIT);
             }
             String sessionId = PreyUtils.randomAlphaNumeric(16);
             PreyLogger.d("#######sessionId:" + sessionId);
             PreyConfig.getPreyConfig(ctx).setSessionId(sessionId);
             final boolean missing = PreyConfig.getPreyConfig(ctx).isMissing();
+            PreyLogger.d("missing:" + missing);
             if (deviceKey != null && !"".equals(deviceKey)) {
                 new Thread() {
                     public void run() {
-                        try {
-                            PreyConfig.getPreyConfig(ctx).registerC2dm();
-                        } catch (Exception e) {
-                        }
-                        try {
-                            PreyWebServices.getInstance().getProfile(ctx);
-                        } catch (Exception e) {
-                            PreyLogger.e("error profile:" + e.getMessage(), e);
-                        }
-                        try {
-                            PreyStatus.getInstance().getConfig(ctx);
-                        } catch (Exception e) {
+                        PreyConfig.getPreyConfig(ctx).registerC2dm();
+                        PreyWebServices.getInstance().getProfile(ctx);
+                        String initName = PreyWebServices.getInstance().getNameDevice(ctx);
+                        if (initName != null && !"".equals(initName)) {
+                            PreyLogger.d("initName:" + initName);
+                            PreyConfig.getPreyConfig(ctx).setDeviceName(initName);
                         }
+                        PreyStatus.getInstance().getConfig(ctx);
                         boolean accessCoarseLocation=PreyPermission.canAccessCoarseLocation(ctx);
                         boolean accessFineLocation=PreyPermission.canAccessFineLocation(ctx);
                         boolean canAccessBackgroundLocation=PreyPermission.canAccessBackgroundLocation(ctx);
-                        try {
-                            if((accessCoarseLocation||accessFineLocation)&&canAccessBackgroundLocation) {
-                                GeofenceController.getInstance().run(ctx);
-                            }
-                        } catch (Exception e) {
-                        }
-                        try {
-                            if((accessCoarseLocation||accessFineLocation)&&canAccessBackgroundLocation) {
-                                AwareController.getInstance().init(ctx);
-                            }
-                        } catch (Exception e) {
-                        }
-                        try {
-                            FileretrievalController.getInstance().run(ctx);
-                        } catch (Exception e) {
-                        }
-                        try {
-                            TriggerController.getInstance().run(ctx);
-                        } catch (Exception e) {
+                        if((accessCoarseLocation||accessFineLocation)&&canAccessBackgroundLocation) {
+                            GeofenceController.getInstance().run(ctx);
+                            AwareController.getInstance().init(ctx);
                         }
+                        FileretrievalController.getInstance().run(ctx);
+                        TriggerController.getInstance().run(ctx);
                         if (missing) {
                             if (PreyConfig.getPreyConfig(ctx).getIntervalReport() != null && !"".equals(PreyConfig.getPreyConfig(ctx).getIntervalReport())) {
                                 ReportScheduled.getInstance(ctx).run();
@@ -138,6 +122,7 @@ public void run() {
                                     AwareJobService.schedule(ctx);
                                 }
                             } catch (Exception e) {
+                                PreyLogger.e("error jobService.schedule : " + e.getMessage(), e);
                             }
                             if (PreyConfig.getPreyConfig(ctx).isRunBackground()) {
                                 RunBackgroundCheckBoxPreference.notifyReady(ctx);
@@ -192,4 +177,4 @@ public static void setInstallData(Map<String, String> conversionData) {
         }
     }
 
-}
+}