sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[API/Librus] Fix r() IndexOutOfBounds. Fix Descriptive grades NPE.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2019-09-25 21:40:03 +02:00
parent 3e6b0250d0
commit 554097fc7d
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java
View File

@ -435,6 +435,10 @@ public class Librus implements EdziennikInterface {
callback.onProgress(PROGRESS_STEP); callback.onProgress(PROGRESS_STEP);
index++; index++;
} }
if (index > targetEndpoints.size()) {
finish();
return;
}
d(TAG, "Called r("+type+", "+endpoint+"). Getting "+targetEndpoints.get(index)); d(TAG, "Called r("+type+", "+endpoint+"). Getting "+targetEndpoints.get(index));
switch (targetEndpoints.get(index)) { switch (targetEndpoints.get(index)) {
case "Me": case "Me":
@ -2409,7 +2413,15 @@ public class Librus implements EdziennikInterface {
long teacherId = grade.get("AddedBy").getAsJsonObject().get("Id").getAsLong(); long teacherId = grade.get("AddedBy").getAsJsonObject().get("Id").getAsLong();
int semester = grade.get("Semester").getAsInt(); int semester = grade.get("Semester").getAsInt();
long subjectId = grade.get("Subject").getAsJsonObject().get("Id").getAsLong(); long subjectId = grade.get("Subject").getAsJsonObject().get("Id").getAsLong();
String description = grade.get("Map").getAsString(); JsonElement map = grade.get("Map");
JsonElement realGrade = grade.get("RealGradeValue");
String description = "";
if (map != null) {
description = map.getAsString();
}
else if (realGrade != null) {
description = realGrade.getAsString();
}
long categoryId = -1; long categoryId = -1;
JsonElement skillEl = grade.get("Skill"); JsonElement skillEl = grade.get("Skill");