#831 Migrate from SQLiteOpenHelper to Room

3 files changed, 27 insertions, 20 deletions

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 7584b966..bdc8abe4 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
@@ -14,12 +14,13 @@ import android.widget.RemoteViews;
 import java.util.NoSuchElementException;
 
 import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.persistence.NotesRoomDatabase;
+import it.niedermann.owncloud.notes.persistence.entity.LocalAccountEntity;
 import it.niedermann.owncloud.notes.preferences.DarkModeSetting;
 import it.niedermann.owncloud.notes.edit.EditNoteActivity;
 import it.niedermann.owncloud.notes.main.MainActivity;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.shared.model.Category;
-import it.niedermann.owncloud.notes.shared.model.LocalAccount;
 import it.niedermann.owncloud.notes.persistence.NotesDatabase;
 import it.niedermann.owncloud.notes.NotesApplication;
 
@@ -36,19 +37,20 @@ public class NoteListWidget extends AppWidgetProvider {
     public static final int PENDING_INTENT_OPEN_APP_RQ = 2;
 
     static void updateAppWidget(Context context, AppWidgetManager awm, int[] appWidgetIds) {
-        final NotesDatabase db = NotesDatabase.getInstance(context);
+        final NotesDatabase sqliteOpenHelperDatabase = NotesDatabase.getInstance(context);
+        final NotesRoomDatabase roomDatabase = NotesRoomDatabase.getInstance(context);
 
         RemoteViews views;
         DarkModeSetting darkTheme;
 
         for (int appWidgetId : appWidgetIds) {
             try {
-                final NoteListsWidgetData data = db.getNoteListWidgetData(appWidgetId);
-                final LocalAccount localAccount = db.getAccount(data.getAccountId());
+                final NoteListsWidgetData data = sqliteOpenHelperDatabase.getNoteListWidgetData(appWidgetId);
+                final LocalAccountEntity localAccountEntity = roomDatabase.getLocalAccountDao().getAccount(data.getAccountId());
 
                 String category = null;
                 if (data.getCategoryId() != null) {
-                    category = db.getCategoryTitleById(data.getAccountId(), data.getCategoryId());
+                    category = sqliteOpenHelperDatabase.getCategoryTitleById(data.getAccountId(), data.getCategoryId());
                 }
 
                 darkTheme = DarkModeSetting.fromModeID(data.getThemeMode());
@@ -89,10 +91,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", 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());
+                        views.setInt(R.id.widget_note_header_dark, "setBackgroundColor", Color.parseColor(localAccountEntity.getColor()));
+                        views.setInt(R.id.widget_note_header_icon_dark, "setColorFilter", Color.parseColor(localAccountEntity.getTextColor()));
+                        views.setInt(R.id.widget_note_list_create_icon_dark, "setColorFilter", Color.parseColor(localAccountEntity.getTextColor()));
+                        views.setTextColor(R.id.widget_note_list_title_tv_dark, Color.parseColor(localAccountEntity.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);
@@ -110,10 +112,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", 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());
+                        views.setInt(R.id.widget_note_header, "setBackgroundColor", Color.parseColor(localAccountEntity.getColor()));
+                        views.setInt(R.id.widget_note_header_icon, "setColorFilter", Color.parseColor(localAccountEntity.getTextColor()));
+                        views.setInt(R.id.widget_note_list_create_icon, "setColorFilter", Color.parseColor(localAccountEntity.getTextColor()));
+                        views.setTextColor(R.id.widget_note_list_title_tv, Color.parseColor(localAccountEntity.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 e927c3b1..6256f578 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
@@ -23,12 +23,15 @@ import java.util.Map;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.LockedActivity;
 import it.niedermann.owncloud.notes.main.MainActivity;
+import it.niedermann.owncloud.notes.persistence.NotesRoomDatabase;
 import it.niedermann.owncloud.notes.shared.model.LocalAccount;
 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.NotesApplication;
 
+import static it.niedermann.owncloud.notes.persistence.entity.LocalAccountEntity.entityToLocalAccount;
+
 public class NoteListWidgetConfigurationActivity extends LockedActivity {
     private static final String TAG = Activity.class.getSimpleName();
 
@@ -40,7 +43,8 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity {
     private NavigationAdapter adapterCategories;
     private NavigationAdapter.NavigationItem itemRecent;
     private NavigationAdapter.NavigationItem itemFavorites;
-    private NotesDatabase db = null;
+    private NotesDatabase sqliteOpenHelperDatabase = null;
+    private NotesRoomDatabase roomDatabase = null;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -48,9 +52,10 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity {
         setResult(RESULT_CANCELED);
         setContentView(R.layout.activity_note_list_configuration);
 
-        db = NotesDatabase.getInstance(this);
+        sqliteOpenHelperDatabase = NotesDatabase.getInstance(this);
+        roomDatabase = NotesRoomDatabase.getInstance(this);
         try {
-            this.localAccount = db.getLocalAccountByAccountName(SingleAccountHelper.getCurrentSingleSignOnAccount(this).name);
+            this.localAccount = entityToLocalAccount(roomDatabase.getLocalAccountDao().getLocalAccountByAccountName(SingleAccountHelper.getCurrentSingleSignOnAccount(this).name));
         } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
             e.printStackTrace();
             Toast.makeText(this, R.string.widget_not_logged_in, Toast.LENGTH_LONG).show();
@@ -104,7 +109,7 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity {
                 data.setAccountId(localAccount.getId());
                 data.setThemeMode(NotesApplication.getAppTheme(getApplicationContext()).getModeId());
 
-                db.createOrUpdateNoteListWidgetData(data);
+                sqliteOpenHelperDatabase.createOrUpdateNoteListWidgetData(data);
 
                 Intent updateIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null,
                         getApplicationContext(), NoteListWidget.class);
@@ -143,7 +148,7 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity {
                 return new ArrayList<>();
             }
             NavigationAdapter.NavigationItem itemUncategorized;
-            List<CategoryNavigationItem> categories = db.getCategories(localAccount.getId());
+            List<CategoryNavigationItem> categories = sqliteOpenHelperDatabase.getCategories(localAccount.getId());
 
             if (!categories.isEmpty() && categories.get(0).label.isEmpty()) {
                 itemUncategorized = categories.get(0);
@@ -151,7 +156,7 @@ public class NoteListWidgetConfigurationActivity extends LockedActivity {
                 itemUncategorized.icon = NavigationAdapter.ICON_NOFOLDER;
             }
 
-            Map<String, Integer> favorites = db.getFavoritesCount(localAccount.getId());
+            Map<String, Integer> favorites = sqliteOpenHelperDatabase.getFavoritesCount(localAccount.getId());
             //noinspection ConstantConditions
             int numFavorites = favorites.containsKey("1") ? favorites.get("1") : 0;
             //noinspection ConstantConditions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetConfigurationActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetConfigurationActivity.java
index ef3bbbe6..25d4f408 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetConfigurationActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetConfigurationActivity.java
@@ -52,7 +52,7 @@ public class SingleNoteWidgetConfigurationActivity extends MainActivity {
         int appWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
 
         try {
-            db.createOrUpdateSingleNoteWidgetData(
+            sqliteOpenHelperDatabase.createOrUpdateSingleNoteWidgetData(
                     new SingleNoteWidgetData(
                             appWidgetId,
                             note.getAccountId(),