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

Changed event identifier from Id to StartDate

Browse Source
This commit is contained in:
Caesar2011
2019-01-16 22:44:35 +01:00
parent 729d3165f7
commit b8fe45e75e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java
View File

@@ -18,7 +18,6 @@ import de.sebse.fuplanner.services.kvv.KVVListener;
import de.sebse.fuplanner.services.kvv.types.Announcement; import de.sebse.fuplanner.services.kvv.types.Announcement;
import de.sebse.fuplanner.services.kvv.types.Assignment; import de.sebse.fuplanner.services.kvv.types.Assignment;
import de.sebse.fuplanner.services.kvv.types.AssignmentList; import de.sebse.fuplanner.services.kvv.types.AssignmentList;
import de.sebse.fuplanner.services.kvv.types.Event;
import de.sebse.fuplanner.services.kvv.types.EventList; import de.sebse.fuplanner.services.kvv.types.EventList;
import de.sebse.fuplanner.services.kvv.types.Grade; import de.sebse.fuplanner.services.kvv.types.Grade;
import de.sebse.fuplanner.services.kvv.types.Modules; import de.sebse.fuplanner.services.kvv.types.Modules;
@@ -100,7 +99,7 @@ public class KVVSyncAdapter extends AbstractThreadedSyncAdapter {
R.string.announcement_updated, R.string.announcement_added, R.string.announcement_removed); R.string.announcement_updated, R.string.announcement_added, R.string.announcement_removed);
sendNotifications(assignments, module.assignments, module.title, Assignment::getTitle, Assignment::getId, sendNotifications(assignments, module.assignments, module.title, Assignment::getTitle, Assignment::getId,
R.string.assignment_updated, R.string.assignment_added, R.string.assignment_removed); R.string.assignment_updated, R.string.assignment_added, R.string.assignment_removed);
sendNotifications(events, module.events, module.title, evt -> evt.getTitle()+" - "+UtilsDate.getModifiedDate(evt.getStartDate()), Event::getId, sendNotifications(events, module.events, module.title, evt -> evt.getTitle()+" - "+UtilsDate.getModifiedDate(evt.getStartDate()), event -> String.valueOf(event.getStartDate()),
R.string.event_updated, R.string.event_added, R.string.event_removed); R.string.event_updated, R.string.event_added, R.string.event_removed);
sendNotifications(gradebook, module.gradebook, module.title, Grade::getItemName, Grade::getItemName, sendNotifications(gradebook, module.gradebook, module.title, Grade::getItemName, Grade::getItemName,
R.string.gradebook_updated, R.string.gradebook_added, R.string.gradebook_removed); R.string.gradebook_updated, R.string.gradebook_added, R.string.gradebook_removed);
@@ -124,7 +123,7 @@ public class KVVSyncAdapter extends AbstractThreadedSyncAdapter {
if (oldList == null || newList == null) { if (oldList == null || newList == null) {
return; return;
} }
ArrayList<T> obsoletes = new ArrayList<T>(); ArrayList<T> obsoletes = new ArrayList<>();
for (T old: oldList) { for (T old: oldList) {
obsoletes.add(old); obsoletes.add(old);
} }

2
app/src/main/java/de/sebse/fuplanner/services/kvv/types/Event.java
View File

@@ -118,6 +118,6 @@ public class Event implements Serializable {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hashCode(getId(), getType(), getStartDate(), getEndDate(), getTitle(), getLocation()); return Objects.hashCode(getType(), getStartDate(), getEndDate(), getTitle(), getLocation());
} }
} }