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

Added Upcoming Events to KVVModuleList

Browse Source
This commit is contained in:
Caesar2011
2018-06-07 11:10:36 +02:00
parent f040fecc74
commit 5dc98a7ed7
3 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
View File

@@ -86,7 +86,15 @@ public class ModDetailOverviewFragment extends Fragment {
adapter.setModule(module); adapter.setModule(module);
kvv.getModuleAnnouncements(module, module1 -> { kvv.getModuleAnnouncements(module, module1 -> {
log.d("announcements", module.announcements); log.d("announcements", module.announcements);
adapter.setModule(module1); adapter.setModule();
}, error -> log.e(error));
kvv.getModuleAssignments(module, module1 -> {
log.d("assignments", module.assignments);
adapter.setModule();
}, error -> log.e(error));
kvv.getModuleEvents(module, module1 -> {
log.d("events", module.events);
adapter.setModule();
}, error -> log.e(error)); }, error -> log.e(error));
}, error -> log.e(error)); }, error -> log.e(error));
} }

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

@@ -61,6 +61,28 @@ public class KVV {
}); });
} }
public void getModuleAssignments(Modules.Module module, final NetworkCallback<Modules.Module> callback, final NetworkErrorCallback error) {
this.getLastToken(token -> {
KVVModuleList modules = (KVVModuleList) addons.get("modules");
if (modules == null) {
modules = new KVVModuleList(KVV.this.context, token);
addons.put("modules", modules);
}
modules.getAssignments(module, callback, error);
});
}
public void getModuleEvents(Modules.Module module, final NetworkCallback<Modules.Module> callback, final NetworkErrorCallback error) {
this.getLastToken(token -> {
KVVModuleList modules = (KVVModuleList) addons.get("modules");
if (modules == null) {
modules = new KVVModuleList(KVV.this.context, token);
addons.put("modules", modules);
}
modules.getEvents(module, callback, error);
});
}
private void getLastToken(LastTokenCallback lastTokenCallback) { private void getLastToken(LastTokenCallback lastTokenCallback) {
if (this.isUpdating) { if (this.isUpdating) {
this.updatingList.add(lastTokenCallback); this.updatingList.add(lastTokenCallback);

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

@@ -156,4 +156,28 @@ public class KVVModuleList extends HTTPService {
private void getAssignmentsUpgrade(String ID, final NetworkCallback<ArrayList<Assignment>> callback, final NetworkErrorCallback errorCallback) { private void getAssignmentsUpgrade(String ID, final NetworkCallback<ArrayList<Assignment>> callback, final NetworkErrorCallback errorCallback) {
callback.onResponse(new ArrayList<Assignment>()); callback.onResponse(new ArrayList<Assignment>());
} }
public void getEvents(Modules.Module module, final NetworkCallback<Modules.Module> callback, final NetworkErrorCallback errorCallback) {
queueModuleDetails.add(module.getID(), () -> {
if (module.events != null) {
callback.onResponse(module);
queueModuleDetails.next(module.getID());
return;
}
getEventsUpgrade(module.getID(), success -> {
module.events = success;
callback.onResponse(module);
queueModuleDetails.next(module.getID());
}, errorCallback);
});
}
private void getEventsUpgrade(String ID, final NetworkCallback<ArrayList<Event>> callback, final NetworkErrorCallback errorCallback) {
callback.onResponse(new ArrayList<Event>());
}
} }