Fix some stupid bug with Volley

badetitou
1 parent f5506a08
Showing 5 changed files with 47 additions and 10 deletions Show diff stats
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java
app/src/main/res/values-fr/strings.xml
@@ -99,7 +99,7 @@ public class EventFragment extends FragmentNFC {
             Toast.makeText(getContext(), R.string.payment_consumable_alert_no_selection, Toast.LENGTH_LONG).show();
         }
         else {
-            paiementEvent.processNFC();
+            paiementEvent.processNFC(idCardUser);
         }
     }
@@ -66,7 +66,6 @@ public class PaiementEvent extends DialogFragment {
                 .setView(view)
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll("PAYMENT");
                     }
                 });
         // Create the AlertDialog object and return it
@@ -76,12 +75,11 @@ public class PaiementEvent extends DialogFragment {
     }
-    public void processNFC() {
+    public void processNFC(String idCardUser) {
         mProgressBar.setVisibility(View.VISIBLE);
         JSONObject jsonObject = new JSONObject();
         try {
-            jsonObject.put("participant", 1);
-            jsonObject.put("acteur", 2);
+            jsonObject.put("participant", idCardUser);
             jsonObject.put("id", eventId);
         } catch (JSONException e) {
             e.printStackTrace();
@@ -103,7 +101,27 @@ public class PaiementEvent extends DialogFragment {
         }
         );
-        jsonObjectRequest.setTag("PAYMENT");
+        jsonObjectRequest.setTag(PaiementEvent.class);
         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
     }
+
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(PaiementEvent.class);
+        super.onCancel(dialog);
+    }
+
+    @Override
+    public void onStop() {
+        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(PaiementEvent.class);
+        super.onStop();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        dismiss();
+    }
+
 }
@@ -32,6 +32,7 @@ import net.plil.clubinfo.etunicorn.data.Consommation;
 import net.plil.clubinfo.etunicorn.data.Event;
 import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
+import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import java.util.ArrayList;
 import java.util.List;
@@ -17,6 +17,7 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.event.PaiementEvent;
 import net.plil.clubinfo.etunicorn.data.Consommation;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
@@ -71,7 +72,6 @@ public class PaiementConsommation extends DialogFragment {
                 .setView(view)
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll("PAYMENT");
                     }
                 });
         // Create the AlertDialog object and return it
@@ -108,7 +108,25 @@ public class PaiementConsommation extends DialogFragment {
             }
         }
         );
-        jsonObjectRequest.setTag("PAYMENT");
+        jsonObjectRequest.setTag(PaiementConsommation.class);
         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
     }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(PaiementConsommation.class);
+        super.onCancel(dialog);
+    }
+
+    @Override
+    public void onStop() {
+        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(PaiementConsommation.class);
+        super.onStop();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        dismiss();
+    }
 }
@@ -16,8 +16,8 @@
     <string name="valid">OK</string>
     <string name="title_activity_main">Etunicorn - Bonjour</string>
     <string name="payment_consumable">Paiement d\'un Consommable</string>
-    <string name="payment_refused">Paiement accepté</string>
-    <string name="payment_done">Paiement refusé</string>
+    <string name="payment_refused">Paiement refusé</string>
+    <string name="payment_done">Paiement accepté</string>
     <string name="payment_consumable_alert_no_selection">Selectionné un produit avant de payer</string>
     <string name="action_delete">Supprimer</string>
     <string name="delete">Supprimer</string>