mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-26 23:27:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

#831 Migrate from SQLiteOpenHelper to Room

Browse source
This commit is contained in:
Stefan Niedermann 2020-10-08 00:11:04 +02:00
parent 8a87182d4d
commit 31586c7ddd
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
View file

@ -41,7 +41,7 @@ public class LoadNotesListTask extends AsyncTask<Void, Void, List<Item>> {
List<Note> noteList;
NotesDatabase db = NotesDatabase.getInstance(context);
CategorySortingMethod sortingMethod = db.getCategoryOrder(accountId, category);
noteList = db.getNoteDao().searchNotesSubcategory(accountId, searchQuery == null ? "" : searchQuery.toString(), category.category, category.favorite, sortingMethod);
noteList = db.getNoteDao().searchNotesSubcategory(accountId, searchQuery == null ? "%" : "%" + searchQuery + "%", category.category, Boolean.TRUE.equals(category.favorite), sortingMethod);
if (category.category == null) {
if (sortingMethod == CategorySortingMethod.SORT_MODIFIED_DESC) {
@ -59,8 +59,7 @@ public class LoadNotesListTask extends AsyncTask<Void, Void, List<Item>> {
private List<Item> fillListByCategory(@NonNull List<Note> noteList) {
List<Item> itemList = new ArrayList<>();
String currentCategory = category.category;
for (Note entity : noteList) {
Note note = entity;
for (Note note : noteList) {
if (currentCategory != null && !currentCategory.equals(note.getCategory())) {
itemList.add(new SectionItem(NoteUtil.extendCategory(note.getCategory())));
}

11
app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/NoteDao.java
View file

@ -11,6 +11,7 @@ import java.util.Set;
import it.niedermann.owncloud.notes.persistence.NoteServerSyncHelper;
import it.niedermann.owncloud.notes.persistence.entity.Note;
import it.niedermann.owncloud.notes.persistence.entity.NoteWithCategory;
import it.niedermann.owncloud.notes.shared.model.CategorySortingMethod;
import it.niedermann.owncloud.notes.shared.model.DBStatus;
@ -79,7 +80,7 @@ public interface NoteDao {
/**
* Returns a list of all Notes in the Database which were modified locally
*
* @return {@link List< Note >}
* @return {@link List<Note>}
*/
@Query("SELECT * FROM NOTE WHERE status != '' AND accountId = :accountId")
List<Note> getLocalModifiedNotes(long accountId);
@ -96,7 +97,9 @@ public interface NoteDao {
/**
* Needed for subcategories, see https://github.com/stefan-niedermann/nextcloud-notes/issues/902
*/
@Query("SELECT * FROM NOTE WHERE accountId = :accountId AND status != 'LOCAL_DELETED' AND (title LIKE '%' + :query + '%' OR content LIKE '%' + :query + '%' OR categoryId LIKE '%' + :query + '%') AND (categoryId = :category OR title LIKE :category + '/%') AND favorite = :favorite ORDER BY categoryId, favorite DESC, :sortingMethod")
@Query("SELECT *, CATEGORY.title as 'category' FROM NOTE INNER JOIN CATEGORY ON categoryId = CATEGORY.id WHERE NOTE.accountId = :accountId AND status != 'LOCAL_DELETED' AND ( " +
"NOTE.title LIKE :query OR content LIKE :query OR CATEGORY.title LIKE :query) AND (CATEGORY.title = :category OR CATEGORY.title LIKE :category + '/%' " +
") AND favorite = :favorite ORDER BY categoryId, favorite DESC, :sortingMethod")
List<Note> searchNotesSubcategory(long accountId, String query, String category, Boolean favorite, CategorySortingMethod sortingMethod);
@Query("UPDATE NOTE SET remoteId = :remoteId WHERE id = :id")
@ -107,7 +110,7 @@ public interface NoteDao {
* (i.e. all (!) user changeable columns (content, favorite, category) must still have the same value), uses reference value gathered at start of synchronization
*/
@Query("UPDATE NOTE SET id = :id, title = :title, modified = :modified, title = :title, favorite = :favorite, etag = :eTag, content = :content " +
"WHERE id = :id AND content = :content AND favorite = :favorite AND categoryId = :categoryTitle")
"WHERE id = :id AND content = :content AND favorite = :favorite AND categoryId = :categoryTitle")
void updateIfModifiedLocallyDuringSync(long id, long modified, String title, Boolean favorite, String categoryTitle, String eTag, String content);
@ -115,6 +118,6 @@ public interface NoteDao {
* used by: {@link NoteServerSyncHelper.SyncTask#pullRemoteChanges()} update only, if not modified locally (i.e. STATUS="") and if modified remotely (i.e. any (!) column has changed)
*/
@Query("UPDATE NOTE SET id = :id, title = :title, modified = :modified, title = :title, favorite = :favorite, etag = :eTag, content = :content " +
"WHERE id = :id AND status = '' AND (modified != :modified OR favorite != :favorite OR categoryId != :categoryTitle OR (eTag == NULL OR eTag != :eTag) OR content != :content)")
"WHERE id = :id AND status = '' AND (modified != :modified OR favorite != :favorite OR categoryId != :categoryTitle OR (eTag == NULL OR eTag != :eTag) OR content != :content)")
void updateIfNotModifiedLocallyAndRemoteColumnHasChanged(long id, long modified, String title, Boolean favorite, String categoryTitle, String eTag, String content);
}

6
app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
View file

@ -189,12 +189,6 @@ public class Note implements Serializable, Item {
this.category = category;
}
@Ignore
@Override
public boolean isSection() {
return false;
}
@NonNull
@Override
public String toString() {

6
app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/NoteWithCategory.java
View file

@ -2,10 +2,12 @@ package it.niedermann.owncloud.notes.persistence.entity;
import androidx.room.Embedded;
public class NoteWithCategory {
import it.niedermann.owncloud.notes.shared.model.Item;
public class NoteWithCategory implements Item {
@Embedded
private Note note;
@Embedded
@Embedded(prefix = "category_")
private Category category;
public Note getNote() {

4
app/src/main/java/it/niedermann/owncloud/notes/shared/model/Item.java
View file

@ -1,5 +1,7 @@
package it.niedermann.owncloud.notes.shared.model;
public interface Item {
boolean isSection();
default boolean isSection() {
return false;
}
}