#831 Migrate from SQLiteOpenHelper to Room

Try to map table and column names for easier migration

6 files changed, 22 insertions, 80 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/AbstractWidgetData.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/AbstractWidgetData.java
index 9873d100..35c4c9df 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/AbstractWidgetData.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/AbstractWidgetData.java
@@ -1,14 +1,18 @@
 package it.niedermann.owncloud.notes.widget;
 
 import androidx.annotation.IntRange;
+import androidx.room.ColumnInfo;
 import androidx.room.PrimaryKey;
 
 public abstract class AbstractWidgetData {
 
     @PrimaryKey
+    @ColumnInfo(name = "ID")
     private int id;
+    @ColumnInfo(name = "ACCOUNT_ID")
     private long accountId;
     @IntRange(from = 0, to = 2)
+    @ColumnInfo(name = "THEME_MODE")
     private int themeMode;
 
     protected AbstractWidgetData() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
index 5f39fa19..615d3bc3 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
@@ -20,13 +20,14 @@ import it.niedermann.owncloud.notes.edit.EditNoteActivity;
 import it.niedermann.owncloud.notes.main.MainActivity;
 import it.niedermann.owncloud.notes.persistence.NotesDatabase;
 import it.niedermann.owncloud.notes.persistence.entity.LocalAccount;
+import it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData;
 import it.niedermann.owncloud.notes.preferences.DarkModeSetting;
 import it.niedermann.owncloud.notes.shared.model.OldCategory;
 
 import static it.niedermann.owncloud.notes.edit.EditNoteActivity.PARAM_CATEGORY;
-import static it.niedermann.owncloud.notes.widget.notelist.NoteListsWidgetData.MODE_DISPLAY_ALL;
-import static it.niedermann.owncloud.notes.widget.notelist.NoteListsWidgetData.MODE_DISPLAY_CATEGORY;
-import static it.niedermann.owncloud.notes.widget.notelist.NoteListsWidgetData.MODE_DISPLAY_STARRED;
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_ALL;
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_CATEGORY;
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_STARRED;
 
 public class NoteListWidget extends AppWidgetProvider {
     private static final String TAG = NoteListWidget.class.getSimpleName();
@@ -43,7 +44,7 @@ public class NoteListWidget extends AppWidgetProvider {
 
         for (int appWidgetId : appWidgetIds) {
             try {
-                final NoteListsWidgetData data = db.getWidgetNotesListDao().getNoteListWidgetData(appWidgetId);
+                final NotesListWidgetData data = db.getWidgetNotesListDao().getNoteListWidgetData(appWidgetId);
                 final LocalAccount localAccount = db.getLocalAccountDao().getAccount(data.getAccountId());
 
                 String category = null;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java
index 5464586a..3d1e4210 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java
@@ -29,6 +29,10 @@ import it.niedermann.owncloud.notes.persistence.NotesDatabase;
 import it.niedermann.owncloud.notes.persistence.entity.LocalAccount;
 import it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData;
 
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_ALL;
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_CATEGORY;
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_STARRED;
+
 
 public class NoteListWidgetConfigurationActivity extends LockedActivity {
     private static final String TAG = Activity.class.getSimpleName();
@@ -89,11 +93,11 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity {
 
                 data.setId(appWidgetId);
                 if (itemRecent.equals(item)) {
-                    data.setMode(NoteListsWidgetData.MODE_DISPLAY_ALL);
+                    data.setMode(MODE_DISPLAY_ALL);
                 } else if (itemFavorites.equals(item)) {
-                    data.setMode(NoteListsWidgetData.MODE_DISPLAY_STARRED);
+                    data.setMode(MODE_DISPLAY_STARRED);
                 } else {
-                    data.setMode(NoteListsWidgetData.MODE_DISPLAY_CATEGORY);
+                    data.setMode(MODE_DISPLAY_CATEGORY);
                     if (item instanceof CategoryNavigationItem) {
                         data.setCategoryId(((CategoryNavigationItem) item).categoryId);
                     } else {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
index aaa18956..7208bbe9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
@@ -16,17 +16,19 @@ import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.edit.EditNoteActivity;
 import it.niedermann.owncloud.notes.persistence.NotesDatabase;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData;
 import it.niedermann.owncloud.notes.preferences.DarkModeSetting;
 
-import static it.niedermann.owncloud.notes.widget.notelist.NoteListsWidgetData.MODE_DISPLAY_ALL;
-import static it.niedermann.owncloud.notes.widget.notelist.NoteListsWidgetData.MODE_DISPLAY_CATEGORY;
-import static it.niedermann.owncloud.notes.widget.notelist.NoteListsWidgetData.MODE_DISPLAY_STARRED;
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_ALL;
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_CATEGORY;
+import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_STARRED;
+
 
 public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFactory {
     private static final String TAG = NoteListWidgetFactory.class.getSimpleName();
 
     private final Context context;
-    private final NoteListsWidgetData data;
+    private final NotesListWidgetData data;
     private final boolean darkTheme;
     private NotesDatabase db;
     private List<Note> noteEntities;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListsWidgetData.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListsWidgetData.java
deleted file mode 100644
index a21714ce..00000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListsWidgetData.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package it.niedermann.owncloud.notes.widget.notelist;
-
-import androidx.annotation.IntRange;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import it.niedermann.owncloud.notes.widget.AbstractWidgetData;
-
-public class NoteListsWidgetData extends AbstractWidgetData {
-    public static final int MODE_DISPLAY_ALL = 0;
-    public static final int MODE_DISPLAY_STARRED = 1;
-    public static final int MODE_DISPLAY_CATEGORY = 2;
-
-    @IntRange(from = 0, to = 2)
-    private int mode;
-    @Nullable
-    private Long categoryId;
-
-    public int getMode() {
-        return mode;
-    }
-
-    public void setMode(@IntRange(from = 0, to = 2) int mode) {
-        this.mode = mode;
-    }
-
-    @Nullable
-    public Long getCategoryId() {
-        return categoryId;
-    }
-
-    public void setCategoryId(@Nullable Long categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return "NoteListsWidgetData{" +
-                "mode=" + mode +
-                ", categoryId=" + categoryId +
-                '}';
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetData.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetData.java
deleted file mode 100644
index 79b83006..00000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetData.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package it.niedermann.owncloud.notes.widget.singlenote;
-
-import it.niedermann.owncloud.notes.widget.AbstractWidgetData;
-
-public class SingleNoteWidgetData extends AbstractWidgetData {
-    private long noteId;
-
-    public SingleNoteWidgetData() {
-
-    }
-
-    public SingleNoteWidgetData(int appWidgetId, long accountId, long noteId, int themeMode) {
-        super(appWidgetId, accountId, themeMode);
-        this.noteId = noteId;
-    }
-
-    public long getNoteId() {
-        return noteId;
-    }
-
-    public void setNoteId(long noteId) {
-        this.noteId = noteId;
-    }
-
-}