diff options
4 files changed, 4 insertions, 48 deletions
diff --git a/app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java b/app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java index 9988d62d..5b159f09 100644 --- a/app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java +++ b/app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java @@ -22,7 +22,6 @@ import java.util.List; import it.niedermann.owncloud.notes.persistence.entity.Account; import it.niedermann.owncloud.notes.persistence.entity.CategoryWithNotesCount; import it.niedermann.owncloud.notes.persistence.entity.Note; -import it.niedermann.owncloud.notes.persistence.entity.NoteIdPair; import it.niedermann.owncloud.notes.shared.model.Capabilities; import static it.niedermann.owncloud.notes.persistence.NotesDatabaseTestUtil.getOrAwaitValue; @@ -126,7 +125,7 @@ public class NotesDaoTest { db.getNoteDao().addNote(new Note(666, 1234L, Calendar.getInstance(), "T", "C", "", false, "1", LOCAL_EDITED, account.getId(), "", 0)); db.getNoteDao().addNote(new Note(987, 6969L, Calendar.getInstance(), "T", "C", "", false, "1", LOCAL_DELETED, account.getId(), "", 0)); - final List<NoteIdPair> pair = db.getNoteDao().getRemoteIdAndId(account.getId()); + final List<Note> pair = db.getNoteDao().getRemoteIdAndId(account.getId()); assertEquals(2, pair.size()); assertTrue(pair.stream().anyMatch(note -> 815 == note.getId() && Long.valueOf(4711).equals(note.getRemoteId()))); assertTrue(pair.stream().anyMatch(note -> 666 == note.getId() && Long.valueOf(1234).equals(note.getRemoteId()))); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java index d88a6348..05e8955f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java @@ -48,7 +48,6 @@ import it.niedermann.owncloud.notes.persistence.entity.Account; import it.niedermann.owncloud.notes.persistence.entity.CategoryOptions; import it.niedermann.owncloud.notes.persistence.entity.Converters; import it.niedermann.owncloud.notes.persistence.entity.Note; -import it.niedermann.owncloud.notes.persistence.entity.NoteIdPair; import it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData; import it.niedermann.owncloud.notes.persistence.entity.SingleNoteWidgetData; import it.niedermann.owncloud.notes.persistence.migration.Migration_10_11; @@ -221,7 +220,7 @@ public abstract class NotesDatabase extends RoomDatabase { public Map<Long, Long> getIdMap(long accountId) { validateAccountId(accountId); Map<Long, Long> result = new HashMap<>(); - for (NoteIdPair pair : getNoteDao().getRemoteIdAndId(accountId)) { + for (Note pair : getNoteDao().getRemoteIdAndId(accountId)) { result.put(pair.getRemoteId(), pair.getId()); } return result; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java index 6b8cb97c..aa7fefb6 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java @@ -14,7 +14,6 @@ import it.niedermann.owncloud.notes.persistence.NoteServerSyncHelper; import it.niedermann.owncloud.notes.persistence.entity.Account; import it.niedermann.owncloud.notes.persistence.entity.CategoryWithNotesCount; import it.niedermann.owncloud.notes.persistence.entity.Note; -import it.niedermann.owncloud.notes.persistence.entity.NoteIdPair; import it.niedermann.owncloud.notes.shared.model.DBStatus; @SuppressWarnings("JavadocReference") @@ -136,8 +135,8 @@ public interface NoteDao { @Query("SELECT DISTINCT remoteId FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED'") List<Long> getRemoteIds(long accountId); - @Query("SELECT id, remoteId FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED'") - List<NoteIdPair> getRemoteIdAndId(long accountId); + @Query("SELECT id, remoteId, 0 as accountId, '' as title, 0 as favorite, '' as excerpt, 0 as modified, '' as eTag, 0 as status, '' as category, '' as content, 0 as scrollY FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED'") + List<Note> getRemoteIdAndId(long accountId); /** * Get a single {@link Note} by {@link Note#remoteId} (aka. Nextcloud file id) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/NoteIdPair.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/NoteIdPair.java deleted file mode 100644 index c594d1b8..00000000 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/NoteIdPair.java +++ /dev/null @@ -1,41 +0,0 @@ -package it.niedermann.owncloud.notes.persistence.entity; - -public class NoteIdPair { - - private long id; - private Long remoteId; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public Long getRemoteId() { - return remoteId; - } - - public void setRemoteId(Long remoteId) { - this.remoteId = remoteId; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof NoteIdPair)) return false; - - NoteIdPair that = (NoteIdPair) o; - - if (id != that.id) return false; - return remoteId != null ? remoteId.equals(that.remoteId) : that.remoteId == null; - } - - @Override - public int hashCode() { - int result = (int) (id ^ (id >>> 32)); - result = 31 * result + (remoteId != null ? remoteId.hashCode() : 0); - return result; - } -} |