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

Lecturer Storage implemented

Browse Source
This commit is contained in:
Caesar2011
2019-02-05 16:35:38 +01:00
parent 46429d3afe
commit 2801261400
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java
View File

@@ -102,6 +102,9 @@ public class ModulesList extends HTTPService {
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }
if (this.mModules == null) {
recv(success -> {}, log::e);
}
} }
public void delete() { public void delete() {

25
app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesListLecturer.java
View File

@@ -79,12 +79,12 @@ class ModulesListLecturer extends HTTPService {
} }
final int[] latch = {sites.length()}; final int[] latch = {sites.length()};
ArrayList<String> lecturerString2 = new ArrayList<>();
for (int i = 0; i < sites.length(); i++) { for (int i = 0; i < sites.length(); i++) {
try { try {
JSONObject lecturerJson = sites.getJSONObject(i); JSONObject lecturerJson = sites.getJSONObject(i);
String userId = lecturerJson.getString("userId"); String userId = lecturerJson.getString("userId");
String role = lecturerJson.getString("courseRoleId"); String role = lecturerJson.getString("courseRoleId");
ArrayList<String> lecturerString2 = new ArrayList<>();
if (!"Student".equals(role)) { if (!"Student".equals(role)) {
lecturerString2.add(userId); lecturerString2.add(userId);
getBBLecturer(userId, success -> { getBBLecturer(userId, success -> {
@@ -97,23 +97,30 @@ class ModulesListLecturer extends HTTPService {
} else { } else {
if (--latch[0] == 0) callback.onResponse(lecturers); if (--latch[0] == 0) callback.onResponse(lecturers);
} }
mStorage.setLecturersPerCourse(moduleID, lecturerString2);
mStorage.save(getContext());
} catch (JSONException e) { } catch (JSONException e) {
log.e(new NetworkError(102103, 403, "Cannot parse lecturers!")); log.e(new NetworkError(102103, 403, "Cannot parse lecturers!"));
log.e("ID:", i, "JSON:", sites); log.e("ID:", i, "JSON:", sites);
e.printStackTrace(); e.printStackTrace();
if (--latch[0] == 0) callback.onResponse(lecturers); if (--latch[0] == 0) callback.onResponse(lecturers);
} catch (IOException e) {
log.e("Saving LecturerStorage failed!");
e.printStackTrace();
} }
} }
mStorage.setLecturersPerCourse(moduleID, lecturerString2);
try {
mStorage.save(getContext());
} catch (IOException e) {
e.printStackTrace();
}
callback.onResponse(lecturers); callback.onResponse(lecturers);
}, error -> errorCallback.onError(new NetworkError(102104, error.networkResponse.statusCode, "Error retrieving lecturers!"))); }, error -> errorCallback.onError(new NetworkError(102104, error.networkResponse.statusCode, "Error retrieving lecturers!")));
} }
public void getBBLecturer(String lecturerID, NetworkCallback<Lecturer> callback, NetworkErrorCallback errorCallback) { public void getBBLecturer(String lecturerID, NetworkCallback<Lecturer> callback, NetworkErrorCallback errorCallback) {
Lecturer lecturerStore = mStorage.getLecturer(lecturerID);
if (lecturerStore != null) {
callback.onResponse(lecturerStore);
return;
}
if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenBB() == null || !mLogin.getLoginTokenBB().isAvailable()) { if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenBB() == null || !mLogin.getLoginTokenBB().isAvailable()) {
errorCallback.onError(new NetworkError(102110, 500, "Currently running in offline mode!")); errorCallback.onError(new NetworkError(102110, 500, "Currently running in offline mode!"));
return; return;
@@ -130,6 +137,12 @@ class ModulesListLecturer extends HTTPService {
String givenName = json.getJSONObject("name").getString("given"); String givenName = json.getJSONObject("name").getString("given");
String familyName = json.getJSONObject("name").getString("family"); String familyName = json.getJSONObject("name").getString("family");
Lecturer lecturer = new Lecturer(givenName, familyName, userName + "@zedat.fu-berlin.de", true); Lecturer lecturer = new Lecturer(givenName, familyName, userName + "@zedat.fu-berlin.de", true);
mStorage.setLecturer(lecturerID, lecturer);
try {
mStorage.save(getContext());
} catch (IOException e) {
e.printStackTrace();
}
callback.onResponse(lecturer); callback.onResponse(lecturer);
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();