#831 Migrate from SQLiteOpenHelper to Room

1 files changed, 8 insertions, 8 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
index abdd4f4a..8ddb26ca 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
@@ -38,7 +38,7 @@ import it.niedermann.owncloud.notes.edit.title.EditTitleDialogFragment;
 import it.niedermann.owncloud.notes.edit.title.EditTitleDialogFragment.EditTitleListener;
 import it.niedermann.owncloud.notes.persistence.NotesDatabase;
 import it.niedermann.owncloud.notes.persistence.entity.LocalAccount;
-import it.niedermann.owncloud.notes.persistence.entity.NoteEntity;
+import it.niedermann.owncloud.notes.persistence.entity.Note;
 import it.niedermann.owncloud.notes.shared.model.ApiVersion;
 import it.niedermann.owncloud.notes.shared.model.DBStatus;
 import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
@@ -67,10 +67,10 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
     private LocalAccount localAccount;
     private SingleSignOnAccount ssoAccount;
 
-    protected NoteEntity note;
+    protected Note note;
     // TODO do we really need this? The reference to note is currently the same
     @Nullable
-    private NoteEntity originalNote;
+    private Note originalNote;
     private int originalScrollY;
     protected NotesDatabase db;
     private NoteFragmentListener listener;
@@ -108,13 +108,13 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
                     isNew = false;
                     note = originalNote = db.getNoteDao().getNote(localAccount.getId(), id);
                 } else {
-                    NoteEntity cloudNote = (NoteEntity) requireArguments().getSerializable(PARAM_NEWNOTE);
+                    Note cloudNote = (Note) requireArguments().getSerializable(PARAM_NEWNOTE);
                     String content = requireArguments().getString(PARAM_CONTENT);
                     if (cloudNote == null) {
                         if (content == null) {
                             throw new IllegalArgumentException(PARAM_NOTE_ID + " is not given, argument " + PARAM_NEWNOTE + " is missing and " + PARAM_CONTENT + " is missing.");
                         } else {
-                            note = new NoteEntity(-1, -1, null, NoteUtil.generateNoteTitle(content), content, false, getString(R.string.category_readonly), null, DBStatus.VOID, -1, "", 0);
+                            note = new Note(-1, -1, null, NoteUtil.generateNoteTitle(content), content, false, getString(R.string.category_readonly), null, DBStatus.VOID, -1, "", 0);
                         }
                     } else {
                         note = db.getNoteDao().getNote(localAccount.getId(), db.addNoteAndSync(ssoAccount, localAccount.getId(), cloudNote));
@@ -122,8 +122,8 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
                     }
                 }
             } else {
-                note = (NoteEntity) savedInstanceState.getSerializable(SAVEDKEY_NOTE);
-                originalNote = (NoteEntity) savedInstanceState.getSerializable(SAVEDKEY_ORIGINAL_NOTE);
+                note = (Note) savedInstanceState.getSerializable(SAVEDKEY_NOTE);
+                originalNote = (Note) savedInstanceState.getSerializable(SAVEDKEY_ORIGINAL_NOTE);
             }
             setHasOptionsMenu(true);
         } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
@@ -403,6 +403,6 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
     public interface NoteFragmentListener {
         void close();
 
-        void onNoteUpdated(NoteEntity note);
+        void onNoteUpdated(Note note);
     }
 }