arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-16 04:49:06 +00:00
Code Issues Releases Wiki Activity

Update requery and remove the afterLoad workaround.

Browse Source 
Prior to this version of requery there was an issue that prevented
afterLoad to be called in some cases. This issue forced us to add an
explicit call to afterLoad. It's now fixed, so the workaround is no
longer required.

Reference issue: https://github.com/requery/requery/issues/487
This commit is contained in:
Tom Hacohen 2017-04-12 11:57:34 +01:00
parent c95aaaf5fd
commit 56996b98c4
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -130,9 +130,9 @@ dependencies {
transitive=true
}
compile 'io.requery:requery:1.2.0'
compile 'io.requery:requery-android:1.2.0'
annotationProcessor 'io.requery:requery-processor:1.2.0'
compile 'io.requery:requery:1.3.0'
compile 'io.requery:requery-android:1.3.0'
annotationProcessor 'io.requery:requery-processor:1.3.0'
compile group: 'com.madgag.spongycastle', name: 'core', version: '1.54.0.0'
compile group: 'com.madgag.spongycastle', name: 'prov', version: '1.54.0.0'

6
app/src/main/java/com/etesync/syncadapter/model/JournalModel.java
View File

@ -56,8 +56,6 @@ public class JournalModel {
List<JournalEntity> journals = data.select(JournalEntity.class).where(JournalEntity.SERVICE.eq(service).and(JournalEntity.DELETED.eq(false))).get().toList();
for (JournalEntity journal : journals) {
// FIXME: For some reason this isn't always being called, manually do it here.
journal.afterLoad();
ret.add(journal.getInfo());
}
@ -66,10 +64,6 @@ public class JournalModel {
public static JournalEntity fetch(EntityDataStore<Persistable> data, String url) {
JournalEntity ret = data.select(JournalEntity.class).where(JournalEntity.UID.eq(url)).limit(1).get().firstOrNull();
if (ret != null) {
// FIXME: For some reason this isn't always being called, manually do it here.
ret.afterLoad();
}
return ret;
}