sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix beim laden der Module

Browse Source
This commit is contained in:
Joshua
2018-11-08 18:31:15 +01:00
parent 44b95d7b70
commit 959733a3c9
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
View File

@@ -96,11 +96,17 @@ class KVVModuleList extends HTTPService {
return; return;
} }
Modules modules = new Modules(token); Modules modules = new Modules(token);
JSONArray sites;
try { try {
JSONObject json = new JSONObject(body); JSONObject json = new JSONObject(body);
JSONArray sites = json.getJSONArray("site_collection"); sites = json.getJSONArray("site_collection");
} catch (JSONException e) {
e.printStackTrace();
errorCallback.onError(new NetworkError(101102, 403, "Cannot parse module list!"));
return;
}
for (int i = 0; i < sites.length(); i++) { for (int i = 0; i < sites.length(); i++) {
try {
JSONObject site = sites.getJSONObject(i); JSONObject site = sites.getJSONObject(i);
String semester = site.getJSONObject("props").getString("term_eid"); String semester = site.getJSONObject("props").getString("term_eid");
HashSet<String> lvNumbers = new HashSet<>(); HashSet<String> lvNumbers = new HashSet<>();
@@ -114,19 +120,17 @@ class KVVModuleList extends HTTPService {
lecturers.add(new Lecturer(lecturer)); lecturers.add(new Lecturer(lecturer));
} }
String type = site.getJSONObject("props").getString("kvv_coursetype"); String type = site.getJSONObject("props").getString("kvv_coursetype");
String description = site.getString("description"); String description = site.optString("description", "");
description = String.valueOf(fromHtml(description)); description = String.valueOf(fromHtml(description));
String id = site.getString("id"); String id = site.getString("id");
modules.addModule(semester, lvNumbers, title, lecturers, type, description, id); modules.addModule(semester, lvNumbers, title, lecturers, type, description, id);
}
} catch (JSONException e) { } catch (JSONException e) {
log.e("Cannot parse module! ID:", i, sites);
e.printStackTrace(); e.printStackTrace();
errorCallback.onError(new NetworkError(101102, 403, "Cannot parse module list!"));
return;
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
log.e("Cannot parse module! ID:", i, sites);
e.printStackTrace(); e.printStackTrace();
errorCallback.onError(new NetworkError(101103, 403, "Cannot parse module list!")); }
return;
} }
// Empty module *may be* because token is invalid -> check // Empty module *may be* because token is invalid -> check
if (modules.size() == 0) if (modules.size() == 0)