Rename and Bug Fixes
This commit is contained in:
@@ -22,7 +22,7 @@ public class Modules {
|
|||||||
@NotNull
|
@NotNull
|
||||||
public ModulesDetails details() {
|
public ModulesDetails details() {
|
||||||
return (ModulesDetails) addAndGet("details", () -> {
|
return (ModulesDetails) addAndGet("details", () -> {
|
||||||
ModulesPart[] parts = {announcements(), assignments(), events(), gradebook(), resources()};
|
PartModules[] parts = {announcements(), assignments(), events(), gradebook(), resources()};
|
||||||
return new ModulesDetails(mLogin, list(), context, parts);
|
return new ModulesDetails(mLogin, list(), context, parts);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
|
|||||||
import de.sebse.fuplanner.tools.network.NetworkError;
|
import de.sebse.fuplanner.tools.network.NetworkError;
|
||||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||||
|
|
||||||
public class ModulesAnnouncements extends ModulesPart<ArrayList<Announcement>> {
|
public class ModulesAnnouncements extends PartModules<ArrayList<Announcement>> {
|
||||||
|
|
||||||
ModulesAnnouncements(Login login, ModulesList list, Context context) {
|
ModulesAnnouncements(Login login, ModulesList list, Context context) {
|
||||||
super(login, list, context);
|
super(login, list, context);
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
|
|||||||
import de.sebse.fuplanner.tools.network.NetworkError;
|
import de.sebse.fuplanner.tools.network.NetworkError;
|
||||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||||
|
|
||||||
public class ModulesAssignments extends ModulesPart<AssignmentList> {
|
public class ModulesAssignments extends PartModules<AssignmentList> {
|
||||||
|
|
||||||
ModulesAssignments(Login login, ModulesList list, Context context) {
|
ModulesAssignments(Login login, ModulesList list, Context context) {
|
||||||
super(login, list, context);
|
super(login, list, context);
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ import de.sebse.fuplanner.tools.network.NetworkError;
|
|||||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||||
|
|
||||||
final public class ModulesDetails extends Part<Pair<Modules.Module, Boolean>> {
|
final public class ModulesDetails extends Part<Pair<Modules.Module, Boolean>> {
|
||||||
private final ModulesPart[] parts;
|
private final PartModules[] parts;
|
||||||
|
|
||||||
ModulesDetails(Login login, ModulesList list, Context context, ModulesPart[] parts) {
|
ModulesDetails(Login login, ModulesList list, Context context, PartModules[] parts) {
|
||||||
super(login, list, context);
|
super(login, list, context);
|
||||||
this.parts = parts;
|
this.parts = parts;
|
||||||
}
|
}
|
||||||
@@ -40,7 +40,7 @@ final public class ModulesDetails extends Part<Pair<Modules.Module, Boolean>> {
|
|||||||
errorCallback.onError(lastError.get());
|
errorCallback.onError(lastError.get());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
for (ModulesPart<?> part: parts) {
|
for (PartModules<?> part: parts) {
|
||||||
part.recv(module, successCb, errorCb, forceRefresh, RETRY_COUNT);
|
part.recv(module, successCb, errorCb, forceRefresh, RETRY_COUNT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
|
|||||||
import de.sebse.fuplanner.tools.network.NetworkError;
|
import de.sebse.fuplanner.tools.network.NetworkError;
|
||||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||||
|
|
||||||
public class ModulesEvents extends ModulesPart<EventList> {
|
public class ModulesEvents extends PartModules<EventList> {
|
||||||
|
|
||||||
ModulesEvents(Login login, ModulesList list, Context context) {
|
ModulesEvents(Login login, ModulesList list, Context context) {
|
||||||
super(login, list, context);
|
super(login, list, context);
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
|
|||||||
import de.sebse.fuplanner.tools.network.NetworkError;
|
import de.sebse.fuplanner.tools.network.NetworkError;
|
||||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||||
|
|
||||||
public class ModulesGradebook extends ModulesPart<ArrayList<Grade>> {
|
public class ModulesGradebook extends PartModules<ArrayList<Grade>> {
|
||||||
|
|
||||||
ModulesGradebook(Login login, ModulesList list, Context context) {
|
ModulesGradebook(Login login, ModulesList list, Context context) {
|
||||||
super(login, list, context);
|
super(login, list, context);
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
|
|||||||
import de.sebse.fuplanner.tools.network.NetworkError;
|
import de.sebse.fuplanner.tools.network.NetworkError;
|
||||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||||
|
|
||||||
import static de.sebse.fuplanner.services.KVV.ModulesPart.RETRY_COUNT;
|
import static de.sebse.fuplanner.services.KVV.PartModules.RETRY_COUNT;
|
||||||
|
|
||||||
public class ModulesList extends HTTPService {
|
public class ModulesList extends HTTPService {
|
||||||
private final Login mLogin;
|
private final Login mLogin;
|
||||||
@@ -172,7 +172,7 @@ public class ModulesList extends HTTPService {
|
|||||||
}
|
}
|
||||||
String type = site.getJSONObject("props").optString("kvv_coursetype", null);
|
String type = site.getJSONObject("props").optString("kvv_coursetype", null);
|
||||||
String description = site.optString("description", "");
|
String description = site.optString("description", "");
|
||||||
description = String.valueOf(ModulesPart.fromHtml(description));
|
description = String.valueOf(PartModules.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) {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
|
|||||||
import de.sebse.fuplanner.tools.network.NetworkError;
|
import de.sebse.fuplanner.tools.network.NetworkError;
|
||||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||||
|
|
||||||
public class ModulesResources extends ModulesPart<ArrayList<Resource>> {
|
public class ModulesResources extends PartModules<ArrayList<Resource>> {
|
||||||
|
|
||||||
ModulesResources(Login login, ModulesList list, Context context) {
|
ModulesResources(Login login, ModulesList list, Context context) {
|
||||||
super(login, list, context);
|
super(login, list, context);
|
||||||
|
|||||||
@@ -10,10 +10,10 @@ import de.sebse.fuplanner.tools.NewAsyncQueue;
|
|||||||
import de.sebse.fuplanner.tools.network.NetworkCallback;
|
import de.sebse.fuplanner.tools.network.NetworkCallback;
|
||||||
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
|
||||||
|
|
||||||
abstract class ModulesPart<T> extends Part<Modules.Module> {
|
abstract class PartModules<T> extends Part<Modules.Module> {
|
||||||
private NewAsyncQueue mQueue = new NewAsyncQueue();
|
private NewAsyncQueue mQueue = new NewAsyncQueue();
|
||||||
|
|
||||||
ModulesPart(Login login, ModulesList list, Context context) {
|
PartModules(Login login, ModulesList list, Context context) {
|
||||||
super(login, list, context);
|
super(login, list, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,7 +36,10 @@ abstract class ModulesPart<T> extends Part<Modules.Module> {
|
|||||||
mLogin.refreshLogin(success -> {
|
mLogin.refreshLogin(success -> {
|
||||||
recv(module, callback, errorCallback, forceRefresh, retries-1);
|
recv(module, callback, errorCallback, forceRefresh, retries-1);
|
||||||
mQueue.next();
|
mQueue.next();
|
||||||
}, errorCallback);
|
}, error2 -> {
|
||||||
|
errorCallback.onError(error2);
|
||||||
|
mQueue.next();
|
||||||
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
errorCallback.onError(error);
|
errorCallback.onError(error);
|
||||||
Reference in New Issue
Block a user