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

Rename and Bug Fixes

Browse Source
This commit is contained in:
Caesar2011
2018-11-13 16:20:19 +01:00
parent a879a085b4
commit 9668fe889e
9 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ public class Modules {
@NotNull
public ModulesDetails 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);
});
}

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

@@ -14,7 +14,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkError;
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) {
super(login, list, context);

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

@@ -15,7 +15,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkError;
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) {
super(login, list, context);

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

@@ -11,9 +11,9 @@ import de.sebse.fuplanner.tools.network.NetworkError;
import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
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);
this.parts = parts;
}
@@ -40,7 +40,7 @@ final public class ModulesDetails extends Part<Pair<Modules.Module, Boolean>> {
errorCallback.onError(lastError.get());
}
};
for (ModulesPart<?> part: parts) {
for (PartModules<?> part: parts) {
part.recv(module, successCb, errorCb, forceRefresh, RETRY_COUNT);
}
}

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

@@ -13,7 +13,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkError;
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) {
super(login, list, context);

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

@@ -14,7 +14,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkError;
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) {
super(login, list, context);

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

@@ -21,7 +21,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkError;
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 {
private final Login mLogin;
@@ -172,7 +172,7 @@ public class ModulesList extends HTTPService {
}
String type = site.getJSONObject("props").optString("kvv_coursetype", null);
String description = site.optString("description", "");
description = String.valueOf(ModulesPart.fromHtml(description));
description = String.valueOf(PartModules.fromHtml(description));
String id = site.getString("id");
modules.addModule(semester, lvNumbers, title, lecturers, type, description, id);
} catch (JSONException e) {

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

@@ -18,7 +18,7 @@ import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkError;
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) {
super(login, list, context);

9
app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesPart.java → app/src/main/java/de/sebse/fuplanner/services/KVV/PartModules.java
View File

@@ -10,10 +10,10 @@ import de.sebse.fuplanner.tools.NewAsyncQueue;
import de.sebse.fuplanner.tools.network.NetworkCallback;
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();
ModulesPart(Login login, ModulesList list, Context context) {
PartModules(Login login, ModulesList list, Context context) {
super(login, list, context);
}
@@ -36,7 +36,10 @@ abstract class ModulesPart<T> extends Part<Modules.Module> {
mLogin.refreshLogin(success -> {
recv(module, callback, errorCallback, forceRefresh, retries-1);
mQueue.next();
}, errorCallback);
}, error2 -> {
errorCallback.onError(error2);
mQueue.next();
});
return;
}
errorCallback.onError(error);