From a447d8cb707f4f01f06b204287d7dd5bb4e290e7 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Mon, 24 Apr 2023 12:50:41 +0200 Subject: [PATCH] refs #5010 --- .../es/repartoverdnatura/MainActivity.java | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java index c3ad9dc..82160cc 100644 --- a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java +++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java @@ -105,10 +105,8 @@ public class MainActivity extends AppCompatActivity { @Override protected void onRestart() { - getRoutes(null); getPending(); getPengingExpeditions(); - super.onRestart(); } @@ -392,8 +390,9 @@ public class MainActivity extends AppCompatActivity { // startActivity(new Intent(this,InfoActivity.class)); Utils.startPicking(this, "info"); } - public void goToFound(View v){ - startActivity(new Intent(this,ExpeditionScanActivity.class)); + + public void goToFound(View v) { + startActivity(new Intent(this, ExpeditionScanActivity.class)); } /* public void goToLoaders(int pos){ Intent i = new Intent(this,LoadersActivity.class); @@ -422,36 +421,36 @@ public class MainActivity extends AppCompatActivity { @Override public void onResponse(Call call, Response response) { Utils.progressBar.getDialog().dismiss(); - if(response.isSuccessful()){ + if (response.isSuccessful()) { - // if (response.body().equals("OK")){ - ArrayList listAux = new ArrayList<>(); + // if (response.body().equals("OK")){ + ArrayList listAux = new ArrayList<>(); - listaPendientes.remove(data); - LocalStorage.udpatePendingSigns(that,listaPendientes); - getPending(); + listaPendientes.remove(data); + LocalStorage.udpatePendingSigns(that, listaPendientes); + getPending(); /* }else{ Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion)); }*/ - }else{ + } 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, response.message()); } } @Override public void onFailure(Call call, Throwable t) { Utils.progressBar.getDialog().dismiss(); - Utils.showErrorDialog(that,t.getMessage()); + Utils.showErrorDialog(that, t.getMessage()); } }); } - public void confirmSavePos(View v){ + public void confirmSavePos(View v) { if (listaPendientes.size() > 0) { Utils.progressBar.show(this, getResources().getString(R.string.please_wait)); final SignDataUpload data = listaPendientes.get(0); @@ -470,20 +469,20 @@ public class MainActivity extends AppCompatActivity { if (response.isSuccessful()) { - listaPendientes.remove(data); - LocalStorage.udpatePendingSigns(that, listaPendientes); - confirmSavePos(null); + listaPendientes.remove(data); + LocalStorage.udpatePendingSigns(that, listaPendientes); + confirmSavePos(null); - } else { - Utils.showErrorDialog(that,response.message()); - } + } else { + Utils.showErrorDialog(that, response.message()); + } } @Override public void onFailure(Call call, Throwable t) { Utils.progressBar.getDialog().dismiss(); - Utils.showErrorDialog(that,t.getMessage()); + Utils.showErrorDialog(that, t.getMessage()); } }); } else {