#831 Migrate from SQLiteOpenHelper to Room

Migration

3 files changed, 13 insertions, 17 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 35c4c9df..9873d100 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,18 +1,14 @@
 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 615d3bc3..aa9b54d5 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
@@ -19,7 +19,7 @@ import it.niedermann.owncloud.notes.branding.BrandingUtil;
 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.Account;
 import it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData;
 import it.niedermann.owncloud.notes.preferences.DarkModeSetting;
 import it.niedermann.owncloud.notes.shared.model.OldCategory;
@@ -45,7 +45,7 @@ public class NoteListWidget extends AppWidgetProvider {
         for (int appWidgetId : appWidgetIds) {
             try {
                 final NotesListWidgetData data = db.getWidgetNotesListDao().getNoteListWidgetData(appWidgetId);
-                final LocalAccount localAccount = db.getLocalAccountDao().getAccount(data.getAccountId());
+                final Account localAccount = db.getAccountDao().getAccount(data.getAccountId());
 
                 String category = null;
                 if (data.getCategoryId() != null) {
@@ -90,10 +90,10 @@ public class NoteListWidget extends AppWidgetProvider {
                     views.setEmptyView(R.id.note_list_widget_lv_dark, R.id.widget_note_list_placeholder_tv_dark);
                     awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.note_list_widget_lv_dark);
                     if (BrandingUtil.isBrandingEnabled(context)) {
-                        views.setInt(R.id.widget_note_header_dark, "setBackgroundColor", Color.parseColor('#' + localAccount.getColor()));
-                        views.setInt(R.id.widget_note_header_icon_dark, "setColorFilter", Color.parseColor('#' + localAccount.getTextColor()));
-                        views.setInt(R.id.widget_note_list_create_icon_dark, "setColorFilter", Color.parseColor('#' + localAccount.getTextColor()));
-                        views.setTextColor(R.id.widget_note_list_title_tv_dark, Color.parseColor('#' + localAccount.getTextColor()));
+                        views.setInt(R.id.widget_note_header_dark, "setBackgroundColor", localAccount.getColor());
+                        views.setInt(R.id.widget_note_header_icon_dark, "setColorFilter", localAccount.getTextColor());
+                        views.setInt(R.id.widget_note_list_create_icon_dark, "setColorFilter", localAccount.getTextColor());
+                        views.setTextColor(R.id.widget_note_list_title_tv_dark, localAccount.getTextColor());
                     } else {
                         views.setInt(R.id.widget_note_header_dark, "setBackgroundColor", context.getResources().getColor(R.color.defaultBrand));
                         views.setInt(R.id.widget_note_header_icon_dark, "setColorFilter", Color.WHITE);
@@ -111,10 +111,10 @@ public class NoteListWidget extends AppWidgetProvider {
                     views.setEmptyView(R.id.note_list_widget_lv, R.id.widget_note_list_placeholder_tv);
                     awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.note_list_widget_lv);
                     if (BrandingUtil.isBrandingEnabled(context)) {
-                        views.setInt(R.id.widget_note_header, "setBackgroundColor", Color.parseColor('#' + localAccount.getColor()));
-                        views.setInt(R.id.widget_note_header_icon, "setColorFilter", Color.parseColor('#' + localAccount.getTextColor()));
-                        views.setInt(R.id.widget_note_list_create_icon, "setColorFilter", Color.parseColor('#' + localAccount.getTextColor()));
-                        views.setTextColor(R.id.widget_note_list_title_tv, Color.parseColor('#' + localAccount.getTextColor()));
+                        views.setInt(R.id.widget_note_header, "setBackgroundColor", localAccount.getColor());
+                        views.setInt(R.id.widget_note_header_icon, "setColorFilter", localAccount.getTextColor());
+                        views.setInt(R.id.widget_note_list_create_icon, "setColorFilter", localAccount.getTextColor());
+                        views.setTextColor(R.id.widget_note_list_title_tv, localAccount.getTextColor());
                     } else {
                         views.setInt(R.id.widget_note_header, "setBackgroundColor", context.getResources().getColor(R.color.defaultBrand));
                         views.setInt(R.id.widget_note_header_icon, "setColorFilter", Color.WHITE);
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 3d1e4210..a9fd06cc 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
@@ -26,7 +26,7 @@ import it.niedermann.owncloud.notes.main.MainActivity;
 import it.niedermann.owncloud.notes.main.NavigationAdapter;
 import it.niedermann.owncloud.notes.main.NavigationAdapter.CategoryNavigationItem;
 import it.niedermann.owncloud.notes.persistence.NotesDatabase;
-import it.niedermann.owncloud.notes.persistence.entity.LocalAccount;
+import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData;
 
 import static it.niedermann.owncloud.notes.persistence.entity.NotesListWidgetData.MODE_DISPLAY_ALL;
@@ -39,7 +39,7 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity {
 
     private int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
 
-    private LocalAccount localAccount = null;
+    private Account localAccount = null;
 
     private NavigationAdapter adapterCategories;
     private NavigationAdapter.NavigationItem itemRecent;
@@ -54,7 +54,7 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity {
 
         db = NotesDatabase.getInstance(this);
         try {
-            this.localAccount = db.getLocalAccountDao().getLocalAccountByAccountName(SingleAccountHelper.getCurrentSingleSignOnAccount(this).name);
+            this.localAccount = db.getAccountDao().getLocalAccountByAccountName(SingleAccountHelper.getCurrentSingleSignOnAccount(this).name);
         } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
             e.printStackTrace();
             Toast.makeText(this, R.string.widget_not_logged_in, Toast.LENGTH_LONG).show();