refactored to support latest jmap library version

iNPUTmice · Aug 24, 2019 · 0f84ef7 · 0f84ef7
1 parent 1038a6b
commit 0f84ef7
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.iml
 .gradle
 /local.properties
+/gradle.properties
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

diff --git a/app/src/main/java/rs/ltt/android/entity/EmailBodyPartEntity.java b/app/src/main/java/rs/ltt/android/entity/EmailBodyPartEntity.java
@@ -29,7 +29,8 @@
         primaryKeys = {"emailId", "bodyPartType", "position"},
         foreignKeys = @ForeignKey(entity = EmailEntity.class,
                 parentColumns = {"id"},
-                childColumns = {"emailId"}
+                childColumns = {"emailId"},
+                onDelete = ForeignKey.CASCADE
         )
 )
 public class EmailBodyPartEntity {

diff --git a/app/src/main/java/rs/ltt/android/entity/EmailBodyValueEntity.java b/app/src/main/java/rs/ltt/android/entity/EmailBodyValueEntity.java
@@ -30,7 +30,8 @@
         primaryKeys = {"emailId", "partId"},
         foreignKeys = @ForeignKey(entity = EmailEntity.class,
                 parentColumns = {"id"},
-                childColumns = {"emailId"}
+                childColumns = {"emailId"},
+                onDelete = ForeignKey.CASCADE
         )
 )
 public class EmailBodyValueEntity {

diff --git a/app/src/main/java/rs/ltt/android/entity/EmailEmailAddressEntity.java b/app/src/main/java/rs/ltt/android/entity/EmailEmailAddressEntity.java
@@ -25,14 +25,12 @@
 import rs.ltt.jmap.common.entity.Email;
 import rs.ltt.jmap.common.entity.EmailAddress;
 
-import static androidx.room.ForeignKey.CASCADE;
-
 @Entity(tableName = "email_email_address",
         primaryKeys = {"emailId", "position", "type"},
         foreignKeys = @ForeignKey(entity = EmailEntity.class,
                 parentColumns = {"id"},
                 childColumns = {"emailId"},
-                onDelete = CASCADE
+                onDelete = ForeignKey.CASCADE
         )
 )
 public class EmailEmailAddressEntity {

diff --git a/app/src/main/java/rs/ltt/android/entity/EmailKeywordEntity.java b/app/src/main/java/rs/ltt/android/entity/EmailKeywordEntity.java
@@ -26,14 +26,12 @@
 import androidx.room.ForeignKey;
 import rs.ltt.jmap.common.entity.Email;
 
-import static androidx.room.ForeignKey.CASCADE;
-
 @Entity(tableName = "email_keyword",
         primaryKeys = {"emailId", "keyword"},
         foreignKeys = @ForeignKey(entity = EmailEntity.class,
                 parentColumns = {"id"},
                 childColumns = {"emailId"},
-                onDelete = CASCADE
+                onDelete = ForeignKey.CASCADE
         )
 )
 public class EmailKeywordEntity {

diff --git a/app/src/main/java/rs/ltt/android/entity/EmailMailboxEntity.java b/app/src/main/java/rs/ltt/android/entity/EmailMailboxEntity.java
@@ -24,14 +24,12 @@
 import androidx.room.ForeignKey;
 import rs.ltt.jmap.common.entity.Email;
 
-import static androidx.room.ForeignKey.CASCADE;
-
 @Entity(tableName = "email_mailbox",
         primaryKeys = {"emailId", "mailboxId"},
         foreignKeys = @ForeignKey(entity = EmailEntity.class,
                 parentColumns = {"id"},
                 childColumns = {"emailId"},
-                onDelete = CASCADE
+                onDelete = ForeignKey.CASCADE
         )
 )
 public class EmailMailboxEntity {

diff --git a/app/src/main/java/rs/ltt/android/repository/LttrsRepository.java b/app/src/main/java/rs/ltt/android/repository/LttrsRepository.java
@@ -43,11 +43,11 @@
 import rs.ltt.android.worker.MuaWorker;
 import rs.ltt.android.worker.RemoveFromMailboxWorker;
 import rs.ltt.jmap.client.session.SessionFileCache;
-import rs.ltt.jmap.common.entity.EmailQuery;
 import rs.ltt.jmap.common.entity.IdentifiableMailboxWithRole;
 import rs.ltt.jmap.common.entity.Keyword;
 import rs.ltt.jmap.common.entity.Role;
 import rs.ltt.jmap.common.entity.filter.EmailFilterCondition;
+import rs.ltt.jmap.common.entity.query.EmailQuery;
 import rs.ltt.jmap.mua.Mua;
 
 public abstract class LttrsRepository {

diff --git a/app/src/main/java/rs/ltt/android/repository/QueryRepository.java b/app/src/main/java/rs/ltt/android/repository/QueryRepository.java
@@ -48,10 +48,10 @@
 import rs.ltt.android.entity.ThreadOverviewItem;
 import rs.ltt.android.worker.ModifyKeywordWorker;
 import rs.ltt.jmap.client.session.SessionFileCache;
-import rs.ltt.jmap.common.entity.EmailQuery;
 import rs.ltt.jmap.common.entity.IdentifiableMailboxWithRole;
 import rs.ltt.jmap.common.entity.Keyword;
 import rs.ltt.jmap.common.entity.Role;
+import rs.ltt.jmap.common.entity.query.EmailQuery;
 import rs.ltt.jmap.mua.Mua;
 
 public class QueryRepository extends LttrsRepository {
@@ -73,6 +73,7 @@ public LiveData<PagedList<ThreadOverviewItem>> getThreadOverviewItems(final Emai
                 .setBoundaryCallback(new PagedList.BoundaryCallback<ThreadOverviewItem>() {
                     @Override
                     public void onZeroItemsLoaded() {
+                        Log.d("lttrs","onZeroItemsLoaded");
                         requestNextPage(query, null); //conceptually in terms of loading indicators this is more of a page request
                         super.onZeroItemsLoaded();
                     }

diff --git a/app/src/main/java/rs/ltt/android/ui/model/AbstractQueryViewModel.java b/app/src/main/java/rs/ltt/android/ui/model/AbstractQueryViewModel.java
@@ -33,8 +33,8 @@
 import rs.ltt.android.entity.ThreadOverviewItem;
 import rs.ltt.android.repository.QueryRepository;
 import rs.ltt.android.worker.ModifyKeywordWorker;
-import rs.ltt.jmap.common.entity.EmailQuery;
 import rs.ltt.jmap.common.entity.Keyword;
+import rs.ltt.jmap.common.entity.query.EmailQuery;
 
 public abstract class AbstractQueryViewModel extends AndroidViewModel {
 

diff --git a/app/src/main/java/rs/ltt/android/ui/model/MailboxQueryViewModel.java b/app/src/main/java/rs/ltt/android/ui/model/MailboxQueryViewModel.java
@@ -25,9 +25,9 @@
 import rs.ltt.android.database.LttrsDatabase;
 import rs.ltt.android.entity.MailboxOverviewItem;
 import rs.ltt.android.entity.ThreadOverviewItem;
-import rs.ltt.jmap.common.entity.EmailQuery;
 import rs.ltt.jmap.common.entity.Role;
 import rs.ltt.jmap.common.entity.filter.EmailFilterCondition;
+import rs.ltt.jmap.common.entity.query.EmailQuery;
 
 public class MailboxQueryViewModel extends AbstractQueryViewModel {
 

diff --git a/app/src/main/java/rs/ltt/android/ui/model/SearchQueryViewModel.java b/app/src/main/java/rs/ltt/android/ui/model/SearchQueryViewModel.java
@@ -34,9 +34,9 @@
 import rs.ltt.android.entity.MailboxOverwriteEntity;
 import rs.ltt.android.entity.MailboxWithRoleAndName;
 import rs.ltt.android.entity.ThreadOverviewItem;
-import rs.ltt.jmap.common.entity.EmailQuery;
 import rs.ltt.jmap.common.entity.Role;
 import rs.ltt.jmap.common.entity.filter.EmailFilterCondition;
+import rs.ltt.jmap.common.entity.query.EmailQuery;
 import rs.ltt.jmap.mua.util.MailboxUtil;
 
 public class SearchQueryViewModel extends AbstractQueryViewModel {