diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java index e0fd8d7..c0aa37d 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java @@ -18,6 +18,7 @@ import android.widget.ProgressBar; import android.widget.Spinner; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; @@ -26,6 +27,7 @@ import com.android.volley.toolbox.JsonObjectRequest; import com.google.gson.Gson; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.data.Role; import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString; import net.plil.clubinfo.etunicorn.utils.JsonConverter; @@ -38,8 +40,10 @@ import org.json.JSONObject; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; public class CreatePersonne extends DialogFragment { @@ -122,7 +126,7 @@ public class CreatePersonne extends DialogFragment { try { jsonObject.put("login", mLogin.getText().toString()); jsonObject.put("carte", mCarte.getText().toString()); - jsonObject.put("role", mRole.getSelectedItem()); + jsonObject.put("role", JsonConverter.convertToJSONObject(mRole.getSelectedItem())); if (!mNaissance.getSelectedItem().equals(getString(R.string.create_personne_naissance))) jsonObject.put("naissance", mNaissance.getSelectedItem()); } catch (JSONException e) { @@ -143,9 +147,18 @@ public class CreatePersonne extends DialogFragment { mCarteInput.setVisibility(View.VISIBLE); mNaissance.setVisibility(View.VISIBLE); mRole.setVisibility(View.VISIBLE); + if (error.networkResponse != null) + Toast.makeText(getContext(), ConvertBytesToString.bytesToStringVolLey(error.networkResponse.data), Toast.LENGTH_LONG).show(); } } - ); + ) + { + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(CreatePersonne.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/DeletePersonne.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/DeletePersonne.java index 4fce793..5e156c3 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/DeletePersonne.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/DeletePersonne.java @@ -11,18 +11,23 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.data.Event; import net.plil.clubinfo.etunicorn.data.Personne; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONObject; +import java.util.HashMap; +import java.util.Map; + public class DeletePersonne extends DialogFragment { @@ -89,7 +94,13 @@ public class DeletePersonne extends DialogFragment { Toast.makeText(getContext(), R.string.delete_refused, Toast.LENGTH_LONG).show(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(DeletePersonne.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } -- libgit2 0.21.2