From 5b44314f6412c2bf26c452b4e71dca5f971bfb39 Mon Sep 17 00:00:00 2001 From: Orlando Aliaga Date: Mon, 20 Mar 2023 16:10:09 -0300 Subject: [PATCH] The device name is sent The device name is sent --- .../java/com/prey/json/actions/Location.java | 16 ++++++++++++++++ .../main/java/com/prey/net/PreyWebServices.java | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/app/src/main/java/com/prey/json/actions/Location.java b/app/src/main/java/com/prey/json/actions/Location.java index 89cf0506..aabd4c39 100644 --- a/app/src/main/java/com/prey/json/actions/Location.java +++ b/app/src/main/java/com/prey/json/actions/Location.java @@ -12,9 +12,11 @@ import org.json.JSONObject; import android.content.Context; +import android.provider.Settings; import com.prey.PreyConfig; import com.prey.PreyLogger; +import com.prey.PreyUtils; import com.prey.actions.HttpDataService; import com.prey.actions.aware.AwareConfig; import com.prey.actions.aware.AwareController; @@ -70,6 +72,20 @@ public List get(Context ctx, List list, JSONObje ArrayList dataToBeSent = new ArrayList(); dataToBeSent.add(data); PreyWebServices.getInstance().sendPreyHttpData(ctx, dataToBeSent); + try { + String nameDevice = Settings.Secure.getString(ctx.getContentResolver(), "bluetooth_name"); + if (nameDevice != null && !"".equals(nameDevice)) { + PreyLogger.d(String.format("nameDevice: %s", nameDevice)); + PreyWebServices.getInstance().sendPreyHttpDataName(ctx, nameDevice); + String nameDeviceInfo = PreyWebServices.getInstance().getNameDevice(ctx); + if (nameDeviceInfo != null && !"".equals(nameDeviceInfo)) { + PreyLogger.d(String.format("nameDeviceInfo: %s", nameDeviceInfo)); + PreyConfig.getPreyConfig(ctx).setDeviceName(nameDeviceInfo); + } + } + } catch (Exception e) { + PreyLogger.d(String.format("Data wasn't send: %s", e.getMessage())); + } return dataToBeSent; } diff --git a/app/src/main/java/com/prey/net/PreyWebServices.java b/app/src/main/java/com/prey/net/PreyWebServices.java index 948b4f1d..c913b7ed 100644 --- a/app/src/main/java/com/prey/net/PreyWebServices.java +++ b/app/src/main/java/com/prey/net/PreyWebServices.java @@ -613,6 +613,22 @@ public PreyHttpResponse sendPreyHttpData(Context ctx, ArrayList return preyHttpResponse; } + public PreyHttpResponse sendPreyHttpDataName(Context ctx, String nameDevice) { + Map parameters = new HashMap(); + PreyHttpResponse preyHttpResponse = null; + parameters.put("name", nameDevice); + try { + String url = getDataUrlJson(ctx); + if (UtilConnection.isInternetAvailable(ctx)) { + preyHttpResponse = PreyRestHttpClient.getInstance(ctx).postAutentication(url, parameters); + PreyLogger.d("Data sent_: " + (preyHttpResponse == null ? "" : preyHttpResponse.getResponseAsString())); + } + } catch (Exception e) { + PreyLogger.e("Data wasn't send", e); + } + return preyHttpResponse; + } + public PreyVerify verifyUsers(Context ctx) throws Exception { String apiKey= PreyConfig.getPreyConfig(ctx).getApiKey(); String apiv2 = FileConfigReader.getInstance(ctx).getApiV2();