Skip to content

Commit 9842886

Browse files
author
Zahrun
committed
Eviter le crash
1 parent f40935d commit 9842886

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

Android/app/app.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
9191
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
9292
<orderEntry type="library" exported="" name="jackson-annotations-2.3.0" level="project" />
93-
<orderEntry type="library" exported="" name="jackson-core-2.3.2" level="project" />
9493
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
94+
<orderEntry type="library" exported="" name="jackson-core-2.3.2" level="project" />
9595
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
9696
<orderEntry type="library" exported="" name="spring-android-core-2.0.0.M3" level="project" />
9797
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />

Android/app/src/main/java/gei/soprapp/FragmentReservations.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void onClick(DialogInterface dialog, int which) {
6868
new Thread(new Runnable() {
6969
@Override
7070
public void run() {
71-
Requests.deleteReservation(selected);
71+
Requests.deleteReservation(view, selected);
7272
}
7373
}).start();
7474
}

Android/app/src/main/java/gei/soprapp/Requests.java

+21-4
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,34 @@ public static Rooms[] getSiteRooms(View view, String site){
203203
return result;
204204
}
205205

206-
public static boolean deleteReservation(Reservations selected) {
206+
public static boolean deleteReservation(final View view, Reservations selected) {
207207
String uri = Globals.REST_URI+"entities.reservations/{id}";
208208

209209
Map<String, String> params = new HashMap<String, String>();
210210
params.put("id", selected.getReservationID().toString());
211211

212212
boolean result = true;
213213

214-
RestTemplate restTemplate = new RestTemplate();
215-
restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
216-
restTemplate.delete(uri, params);
214+
try {
215+
RestTemplate restTemplate = new RestTemplate();
216+
restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
217+
restTemplate.delete(uri, params);
218+
} catch (Exception e){
219+
e.printStackTrace();
220+
if (!Requests.errorDialogPrinted) {
221+
Requests.errorDialogPrinted = true;
222+
view.post(new Runnable() {
223+
@Override
224+
public void run() {
225+
Requests.errorDialog = new AlertDialog.Builder(view.getContext())
226+
.setTitle("Pas de connexion")
227+
.setMessage("La connexion a échoué, vérifiez votre connexion internet.")
228+
.setIcon(android.R.drawable.ic_dialog_alert)
229+
.show();
230+
}
231+
});
232+
}
233+
}
217234

218235
return result;
219236
}

0 commit comments

Comments
 (0)