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

Load module list and parts only if logged in

Browse Source
This commit is contained in:
Sebastian Seedorf
2019-02-08 15:17:28 +01:00
parent 0776447d3b
commit 72216ea7d6
5 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAnnouncements.java
View File

@@ -39,7 +39,7 @@ public class ModulesAnnouncements extends PartModules<ArrayList<Announcement>> {
errorCallback.onError(new NetworkError(101204, 500, "Currently running in offline mode!")); errorCallback.onError(new NetworkError(101204, 500, "Currently running in offline mode!"));
return; return;
} }
super.get(String.format("https://kvv.imp.fu-berlin.de/direct/announcement/site/%s.json?n=999999&d=999999999", ID), mLogin.getLoginTokenKVV().getCookies(), response -> { super.get(String.format("https://kvv.imp.fu-berlin.de/direct/announcement/site/%s.json?n=999999&d=999999999&_validateSession=", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
String body = response.getParsed(); String body = response.getParsed();
if (body == null) { if (body == null) {
errorCallback.onError(new NetworkError(101201, 403, "No announcements retrieved!")); errorCallback.onError(new NetworkError(101201, 403, "No announcements retrieved!"));
@@ -82,10 +82,6 @@ public class ModulesAnnouncements extends PartModules<ArrayList<Announcement>> {
} }
} }
// Empty announcements *may be* because token is invalid -> check
if (announcements.size() == 0)
mLogin.testLoginToken(token -> callback.onResponse(announcements), errorCallback);
else
callback.onResponse(announcements); callback.onResponse(announcements);
}, error -> errorCallback.onError(new NetworkError(101203, error.networkResponse.statusCode, "Cannot get announcements!"))); }, error -> errorCallback.onError(new NetworkError(101203, error.networkResponse.statusCode, "Cannot get announcements!")));
} }

6
app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAssignments.java
View File

@@ -39,7 +39,7 @@ public class ModulesAssignments extends PartModules<AssignmentList> {
errorCallback.onError(new NetworkError(101304, 500, "Currently running in offline mode!")); errorCallback.onError(new NetworkError(101304, 500, "Currently running in offline mode!"));
return; return;
} }
get(String.format("https://kvv.imp.fu-berlin.de/direct/assignment/site/%s.json", ID), mLogin.getLoginTokenKVV().getCookies(), response -> { get(String.format("https://kvv.imp.fu-berlin.de/direct/assignment/site/%s.json?_validateSession=", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
String body = response.getParsed(); String body = response.getParsed();
if (body == null) { if (body == null) {
errorCallback.onError(new NetworkError(101301, 403, "No assignments retrieved!")); errorCallback.onError(new NetworkError(101301, 403, "No assignments retrieved!"));
@@ -80,10 +80,6 @@ public class ModulesAssignments extends PartModules<AssignmentList> {
} }
} }
// Empty assignments *may be* because token is invalid -> check
if (assignments.size() == 0)
mLogin.testLoginToken(token -> callback.onResponse(assignments), errorCallback);
else
callback.onResponse(assignments); callback.onResponse(assignments);
}, error -> errorCallback.onError(new NetworkError(101303, error.networkResponse.statusCode, "Cannot get assignments!"))); }, error -> errorCallback.onError(new NetworkError(101303, error.networkResponse.statusCode, "Cannot get assignments!")));
} }

6
app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java
View File

@@ -45,7 +45,7 @@ public class ModulesEvents extends PartModules<EventList> {
errorCallback.onError(new NetworkError(101404, 500, "Currently running in offline mode!")); errorCallback.onError(new NetworkError(101404, 500, "Currently running in offline mode!"));
return; return;
} }
get(String.format("https://kvv.imp.fu-berlin.de/direct/calendar/site/%s.json?detailed=true", ID), mLogin.getLoginTokenKVV().getCookies(), response -> { get(String.format("https://kvv.imp.fu-berlin.de/direct/calendar/site/%s.json?detailed=true&_validateSession=", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
String body = response.getParsed(); String body = response.getParsed();
if (body == null) { if (body == null) {
errorCallback.onError(new NetworkError(101401, 403, "No events retrieved!")); errorCallback.onError(new NetworkError(101401, 403, "No events retrieved!"));
@@ -81,10 +81,6 @@ public class ModulesEvents extends PartModules<EventList> {
} }
} }
// Empty events *may be* because token is invalid -> check
if (events.size() == 0)
mLogin.testLoginToken(token -> callback.onResponse(events), errorCallback);
else
callback.onResponse(events); callback.onResponse(events);
}, error -> errorCallback.onError(new NetworkError(101403, error.networkResponse.statusCode, "Cannot get events!"))); }, error -> errorCallback.onError(new NetworkError(101403, error.networkResponse.statusCode, "Cannot get events!")));
} }

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

@@ -175,7 +175,7 @@ public class ModulesList extends HTTPService {
callback.onResponse(new Modules(mLogin.getLoginTokenKVV().getUsername())); callback.onResponse(new Modules(mLogin.getLoginTokenKVV().getUsername()));
return; return;
} }
get("https://kvv.imp.fu-berlin.de/direct/site.json", mLogin.getLoginTokenKVV().getCookies(), response -> { get("https://kvv.imp.fu-berlin.de/direct/site.json?_validateSession=", mLogin.getLoginTokenKVV().getCookies(), response -> {
String body = response.getParsed(); String body = response.getParsed();
if (body == null) { if (body == null) {
errorCallback.onError(new NetworkError(101111, 403, "No module list retrieved!")); errorCallback.onError(new NetworkError(101111, 403, "No module list retrieved!"));
@@ -228,10 +228,6 @@ public class ModulesList extends HTTPService {
e.printStackTrace(); e.printStackTrace();
} }
} }
// Empty module *may be* because token is invalid -> check
if (modules.size() == 0)
mLogin.testLoginToken(token -> callback.onResponse(modules), errorCallback);
else
callback.onResponse(modules); callback.onResponse(modules);
}, error -> errorCallback.onError(new NetworkError(101115, error.networkResponse.statusCode, "Cannot get module list!"))); }, error -> errorCallback.onError(new NetworkError(101115, error.networkResponse.statusCode, "Cannot get module list!")));
} }

6
app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesResources.java
View File

@@ -47,7 +47,7 @@ public class ModulesResources extends PartModules<ArrayList<Resource>> {
errorCallback.onError(new NetworkError(101604, 500, "Currently running in offline mode!")); errorCallback.onError(new NetworkError(101604, 500, "Currently running in offline mode!"));
return; return;
} }
get(String.format("https://kvv.imp.fu-berlin.de/direct/content/site/%s.json", ID), mLogin.getLoginTokenKVV().getCookies(), response -> { get(String.format("https://kvv.imp.fu-berlin.de/direct/content/site/%s.json?_validateSession=", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
String body = response.getParsed(); String body = response.getParsed();
if (body == null) { if (body == null) {
errorCallback.onError(new NetworkError(101601, 403, "No resources retrieved!")); errorCallback.onError(new NetworkError(101601, 403, "No resources retrieved!"));
@@ -116,10 +116,6 @@ public class ModulesResources extends PartModules<ArrayList<Resource>> {
} }
} }
// Empty resources *may be* because token is invalid -> check
if (resources.size() == 0)
mLogin.testLoginToken(token -> callback.onResponse(root), errorCallback);
else
callback.onResponse(root); callback.onResponse(root);
}, error -> errorCallback.onError(new NetworkError(101603, error.networkResponse.statusCode, "Cannot get resources!"))); }, error -> errorCallback.onError(new NetworkError(101603, error.networkResponse.statusCode, "Cannot get resources!")));
} }