From 29c49b3089082ff30c01c47fa7b2375387e824d4 Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 9 Mar 2023 08:42:44 +0100 Subject: [PATCH] refs #4632 cambiado el tipo de las imagenes a img/png --- .../es/repartoverdnatura/MainActivity.java | 14 +++++++------- .../es/repartoverdnatura/NetworkStateReveiver.java | 2 +- .../es/repartoverdnatura/SignActivity.java | 3 ++- .../verdnatura/es/repartoverdnatura/Tickets.java | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java index 75265c8..cc7106e 100644 --- a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java +++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java @@ -423,7 +423,7 @@ public class MainActivity extends AppCompatActivity { String token = Utils.getTokenUser(getApplicationContext()); File file = new File(data.getSign()); - MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/*"), file)); + MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file)); Map queryMap = new HashMap<>(); queryMap.put("tickets", data.getTickets().toString()); queryMap.put("location", new Gson().toJson(data.getLocation())); @@ -449,15 +449,15 @@ public class MainActivity extends AppCompatActivity { }else{ //Log.i("ERROR","error al guardar"); - Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion)); - //Utils.showErrorDialog(that,response.message()); + //Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion)); + Utils.showErrorDialog(that,response.message()); } } @Override public void onFailure(Call call, Throwable t) { Utils.progressBar.getDialog().dismiss(); - Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion)); + Utils.showErrorDialog(that,t.getMessage()); } }); } @@ -469,7 +469,7 @@ public class MainActivity extends AppCompatActivity { final MainActivity that = this; String token = Utils.getTokenUser(getApplicationContext()); File file = new File(data.getSign()); - MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/*"), file)); + MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file)); Map queryMap = new HashMap<>(); queryMap.put("tickets", data.getTickets().toString()); queryMap.put("location", new Gson().toJson(data.getLocation())); @@ -486,7 +486,7 @@ public class MainActivity extends AppCompatActivity { confirmSavePos(null); } else { - Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); + Utils.showErrorDialog(that,response.message()); } } @@ -494,7 +494,7 @@ public class MainActivity extends AppCompatActivity { @Override public void onFailure(Call call, Throwable t) { Utils.progressBar.getDialog().dismiss(); - Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); + Utils.showErrorDialog(that,t.getMessage()); } }); }else{ diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java b/app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java index ad9fd05..0a32cd0 100644 --- a/app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java +++ b/app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java @@ -68,7 +68,7 @@ public class NetworkStateReveiver extends BroadcastReceiver { //Utils.progressBar.show(this, getResources().getString(R.string.please_wait)); String token = Utils.getTokenUser(this.context); File file = new File(listData.get(pos).getSign()); - MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/*"), file)); + MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file)); Map queryMap = new HashMap<>(); queryMap.put("tickets", listData.get(pos).getTickets().toString()); queryMap.put("location", new Gson().toJson(listData.get(pos).getLocation())); diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java index c719088..3c708e3 100644 --- a/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java +++ b/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java @@ -250,7 +250,7 @@ public class SignActivity extends AppCompatActivity implements LocationListener{ String token = Utils.getTokenUser(getApplicationContext()); File file = new File(data.getSign()); - MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/*"), file)); + MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", file.getName(), RequestBody.create(MediaType.parse("image/png"), file)); Map queryMap = new HashMap<>(); queryMap.put("tickets", data.getTickets().toString()); queryMap.put("location", new Gson().toJson(data.getLocation())); @@ -274,6 +274,7 @@ public class SignActivity extends AppCompatActivity implements LocationListener{ }else{ // Log.i("ERROR","error al guardar"); + Utils.showErrorDialog(that,response.message()); saveLocal(data); } } diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java b/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java index 46882e2..128ab23 100644 --- a/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java +++ b/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java @@ -134,7 +134,6 @@ public class Tickets extends AppCompatActivity { } else { //Log.i("ERROR", "error al guardar"); - Utils.showErrorDialog(that, that.getResources().getString(R.string.error_conexion)); getData(pos); } } @@ -143,6 +142,7 @@ public class Tickets extends AppCompatActivity { public void onFailure(Call call, Throwable t) { Utils.progressBar.getDialog().dismiss(); getData(pos); + Utils.showErrorDialog(that,t.getMessage()); } }); } else {