Event handle stop dialog

badetitou
1 parent 6e48e148
Showing 5 changed files with 40 additions and 33 deletions Show diff stats
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/CreateEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/DeleteEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/ModifyEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java
@@ -16,6 +16,7 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.consommation.ModifyConsommation;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
@@ -39,8 +40,7 @@ public class CreateEvent extends DialogFragment {
         mPrice = (EditText) view.findViewById(R.id.create_event_price);
         mDate = (EditText) view.findViewById(R.id.create_event_date);
         mProgressBar = (ProgressBar) view.findViewById(R.id.create_event_progress_bar);
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder
+        AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.create_event)
                 .setView(view)
                 .setPositiveButton(R.string.valid, new DialogInterface.OnClickListener() {
@@ -69,18 +69,24 @@ public class CreateEvent extends DialogFragment {
                             }
                         }
                         );
-
+                        jsonObjectRequest.setTag(CreateEvent.class);
                         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
                     }
                 })
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        // User cancelled the dialog
+                        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(CreateEvent.class);
                     }
-                });
-        // Create the AlertDialog object and return it
-        return builder.create();
+                }).create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
     }
+    @Override
+    public void onStop() {
+        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(CreateEvent.class);
+        dismissAllowingStateLoss();
+        super.onStop();
+    }
 }
@@ -55,8 +55,7 @@ public class DeleteEvent extends DialogFragment {
         final Event event = (Event) getArguments().getSerializable("event");
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder
+        AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.verif_delete_event)
                 .setView(view)
                 .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
@@ -80,17 +79,24 @@ public class DeleteEvent extends DialogFragment {
                             }
                         }
                         );
-
+                        jsonObjectRequest.setTag(DeleteEvent.class);
                         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
                     }
                 })
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-
+                        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(DeleteEvent.class);
                     }
-                });
-        return builder.create();
+                }).create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
     }
+    @Override
+    public void onStop() {
+        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(DeleteEvent.class);
+        dismissAllowingStateLoss();
+        super.onStop();
+    }
 }
@@ -61,8 +61,7 @@ public class ModifyEvent extends DialogFragment {
         mPrice.setText(String.format(Locale.FRANCE, "%.2f",  event.getPrice()));
         mDate.setText(event.getDate().toString());
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder
+        AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.modify)
                 .setView(view)
                 .setPositiveButton(R.string.modify, new DialogInterface.OnClickListener() {
@@ -96,17 +95,25 @@ public class ModifyEvent extends DialogFragment {
                             }
                         }
                         );
-
+                        jsonObjectRequest.setTag(ModifyEvent.class);
                         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
                     }
                 })
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        // User cancelled the dialog
+                        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(ModifyEvent.class);
                     }
-                });
+                }).create();
         // Create the AlertDialog object and return it
-        return builder.create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
+    }
+
+    @Override
+    public void onStop() {
+        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll(ModifyEvent.class);
+        dismissAllowingStateLoss();
+        super.onStop();
     }
@@ -66,9 +66,9 @@ 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(PaiementEvent.class);
                     }
                 });
-        // Create the AlertDialog object and return it
         Dialog dialog =  builder.create();
         dialog.setCanceledOnTouchOutside(false);
         return dialog;
@@ -106,22 +106,13 @@ public class PaiementEvent extends DialogFragment {
     }
-    @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);
+        dismissAllowingStateLoss();
         super.onStop();
     }
-    @Override
-    public void onPause() {
-        super.onPause();
-        dismiss();
-    }
 }
@@ -52,9 +52,6 @@ public class Crediter extends FragmentNFC {
         return view;
     }
-
-
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);