Ajout de la gestion des erreurs renvoyees par le serveur dans getGames
This commit is contained in:
parent
4d3196c8f7
commit
7f774a3399
|
@ -93,11 +93,11 @@ public class BaseGame extends Activity implements OnClickListener {
|
||||||
.setNegativeButton("Ok", new DialogInterface.OnClickListener() {
|
.setNegativeButton("Ok", new DialogInterface.OnClickListener() {
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
dialog.cancel();
|
dialog.cancel();
|
||||||
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
AlertDialog alert = builder.create();
|
AlertDialog alert = builder.create();
|
||||||
alert.show();
|
alert.show();
|
||||||
finish();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -144,13 +144,14 @@ public class Network {
|
||||||
URL url = null;
|
URL url = null;
|
||||||
Gson gson = null;
|
Gson gson = null;
|
||||||
BufferedReader reader = null;
|
BufferedReader reader = null;
|
||||||
|
String json = null;
|
||||||
try {
|
try {
|
||||||
// TODO : ne restera le temps que les requete du serveur passe du GET au POST
|
// TODO : ne restera le temps que les requete du serveur passe du GET au POST
|
||||||
String urlS = this.serverURL+"/pticlic.php?"
|
String urlS = this.serverURL+"/pticlic.php?"
|
||||||
+ "action=" + Action.GET_GAMES.value()
|
+ "action=" + Action.GET_GAMES.value()
|
||||||
+ "&user=" + this.id
|
+ "&user=" + this.id
|
||||||
+ "&passwd=" + this.passwd
|
+ "&passwd=" + this.passwd
|
||||||
//+ "&nb=" + String.valueOf(nbGames)
|
+ "&nb=" + String.valueOf(nbGames)
|
||||||
+ "&mode="+mode.value();
|
+ "&mode="+mode.value();
|
||||||
|
|
||||||
url = new URL(urlS);
|
url = new URL(urlS);
|
||||||
|
@ -162,7 +163,7 @@ public class Network {
|
||||||
// connection.addRequestProperty("nb", String.valueOf(nbGames));
|
// connection.addRequestProperty("nb", String.valueOf(nbGames));
|
||||||
// connection.addRequestProperty("mode", mode.value());
|
// connection.addRequestProperty("mode", mode.value());
|
||||||
reader = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"));
|
reader = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"));
|
||||||
String json = reader.readLine();
|
json = reader.readLine();
|
||||||
|
|
||||||
gson = new Gson();
|
gson = new Gson();
|
||||||
//JsonReader reader = new JsonReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
|
//JsonReader reader = new JsonReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
|
||||||
|
@ -176,14 +177,12 @@ public class Network {
|
||||||
}
|
}
|
||||||
jsonReader.endArray();
|
jsonReader.endArray();
|
||||||
jsonReader.close();
|
jsonReader.close();
|
||||||
|
} catch (UnsupportedEncodingException e1) {
|
||||||
|
throw new PtiClicException(0, "Impossible de recuperer l'erreur, nous avons pris note de cette erreur.\n Merci");
|
||||||
|
} catch (IOException e1) {
|
||||||
|
throw new PtiClicException(0, "Impossible de recuperer l'erreur, nous avons pris note de cette erreur.\n Merci");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
try {
|
throw new PtiClicException(json);
|
||||||
throw new PtiClicException(reader.readLine());
|
|
||||||
} catch (UnsupportedEncodingException e1) {
|
|
||||||
throw new PtiClicException(0, "Impossible de recuperer l'erreur, nous avons pris note de cette erreur");
|
|
||||||
} catch (IOException e1) {
|
|
||||||
throw new PtiClicException(0, "Impossible de recuperer l'erreur, nous avons pris note de cette erreur");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return game;
|
return game;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user