diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java index ae1f1f1..d3c5324 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java @@ -195,17 +195,9 @@ public class CarteActivite extends Activity implements ASyncResponse { /* Retour du NetworkThread */ @Override public void processFinish(JSONObject output) { - try { - if (output.get("status").equals("ok")) { - Toast.makeText(this, "Tout c'est bien passé: " + output.get("status").toString(), Toast.LENGTH_LONG).show(); - } else { - Toast.makeText(this, "Erreur lors du traitement de la requête: " + output.get("status").toString(), Toast.LENGTH_LONG).show(); - } - } catch (Throwable t) { - Toast.makeText(this, "WTF, le cancer est dans l'application!! " + t.toString(), Toast.LENGTH_LONG).show(); - } - + Intent intent = new Intent(this, CarteActivite.class); + intent.putExtra("json", output.toString()); + setResult(0, intent); finish(); - return; } } diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java index d0b2146..d347bdc 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java @@ -258,6 +258,17 @@ public class MainActivite extends FragmentActivity implements ASyncResponse { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data){ //TODO: faire des choses avec ca + + try{ + JSONObject json = new JSONObject(data.getStringExtra("json")); + Toast.makeText(this, "Status: " + json.getString("status"), Toast.LENGTH_SHORT).show(); + + } + catch (Throwable t){ + Toast.makeText(this, "WTF, le cancer est dans l'application!!", Toast.LENGTH_LONG).show(); + } + + switch (requestCode) { case STATE_COMMANDE: break; -- libgit2 0.21.2