#831 Migrate from SQLiteOpenHelper to Room

Remove old LocalAccount

5 files changed, 5 insertions, 166 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/accountpicker/AccountPickerDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/accountpicker/AccountPickerDialogFragment.java
index 16d9c33f..93848c4e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/accountpicker/AccountPickerDialogFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/accountpicker/AccountPickerDialogFragment.java
@@ -25,11 +25,10 @@ import it.niedermann.owncloud.notes.persistence.NotesRoomDatabase;
 import it.niedermann.owncloud.notes.persistence.entity.LocalAccountEntity;
 import it.niedermann.owncloud.notes.shared.account.AccountChooserAdapter;
 import it.niedermann.owncloud.notes.shared.account.AccountChooserViewHolder;
-import it.niedermann.owncloud.notes.shared.model.LocalAccount;
 
 /**
- * A {@link DialogFragment} which provides an {@link LocalAccount} chooser that hides the given {@link LocalAccount}.
- * This can be useful when one wants to pick e. g. a target for move a note from one {@link LocalAccount} to another..
+ * A {@link DialogFragment} which provides an {@link LocalAccountEntity} chooser that hides the given {@link LocalAccountEntity}.
+ * This can be useful when one wants to pick e. g. a target for move a note from one {@link LocalAccountEntity} to another..
  */
 public class AccountPickerDialogFragment extends BrandedDialogFragment {
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
index b9317dfe..901a2725 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
@@ -22,13 +22,12 @@ import it.niedermann.owncloud.notes.databinding.DialogAccountSwitcherBinding;
 import it.niedermann.owncloud.notes.manageaccounts.ManageAccountsActivity;
 import it.niedermann.owncloud.notes.persistence.NotesRoomDatabase;
 import it.niedermann.owncloud.notes.persistence.entity.LocalAccountEntity;
-import it.niedermann.owncloud.notes.shared.model.LocalAccount;
 
 import static it.niedermann.owncloud.notes.branding.BrandingUtil.applyBrandToLayerDrawable;
 import static it.niedermann.owncloud.notes.main.MainActivity.manage_account;
 
 /**
- * Displays all available {@link LocalAccount} entries and provides basic operations for them, like adding or switching
+ * Displays all available {@link LocalAccountEntity} entries and provides basic operations for them, like adding or switching
  */
 public class AccountSwitcherDialog extends BrandedDialogFragment {
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/LocalAccountEntity.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/LocalAccountEntity.java
index 229decab..0dc718c7 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/LocalAccountEntity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/LocalAccountEntity.java
@@ -1,7 +1,5 @@
 package it.niedermann.owncloud.notes.persistence.entity;
 
-import android.graphics.Color;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.room.Entity;
@@ -19,7 +17,6 @@ import java.util.NoSuchElementException;
 import it.niedermann.owncloud.notes.persistence.NotesClient;
 import it.niedermann.owncloud.notes.shared.model.ApiVersion;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
-import it.niedermann.owncloud.notes.shared.model.LocalAccount;
 import it.niedermann.owncloud.notes.shared.util.ColorUtil;
 
 @Entity()
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/LocalAccount.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/LocalAccount.java
deleted file mode 100644
index 30e50d0d..00000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/LocalAccount.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package it.niedermann.owncloud.notes.shared.model;
-
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.NoSuchElementException;
-
-import it.niedermann.owncloud.notes.persistence.NotesClient;
-
-@Deprecated
-public class LocalAccount {
-
-    private long id;
-    private String userName;
-    private String accountName;
-    private String url;
-    private String etag;
-    private String capabilitiesETag;
-    private long modified;
-    @Nullable
-    private ApiVersion preferredApiVersion;
-    @ColorInt
-    private int color;
-    @ColorInt
-    private int textColor;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getEtag() {
-        return etag;
-    }
-
-    public void setETag(String etag) {
-        this.etag = etag;
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public long getModified() {
-        return modified;
-    }
-
-    public void setModified(long modified) {
-        this.modified = modified;
-    }
-
-    @Nullable
-    public ApiVersion getPreferredApiVersion() {
-        return preferredApiVersion;
-    }
-
-    public String getCapabilitiesETag() {
-        return capabilitiesETag;
-    }
-
-    public void setCapabilitiesETag(String capabilitiesETag) {
-        this.capabilitiesETag = capabilitiesETag;
-    }
-
-    /**
-     * @param availableApiVersions <code>["0.2", "1.0", ...]</code>
-     */
-    public void setPreferredApiVersion(@Nullable String availableApiVersions) {
-        // TODO move this logic to NotesClient?
-        try {
-            if (availableApiVersions == null) {
-                this.preferredApiVersion = null;
-                return;
-            }
-            JSONArray versionsArray = new JSONArray(availableApiVersions);
-            Collection<ApiVersion> supportedApiVersions = new HashSet<>(versionsArray.length());
-            for (int i = 0; i < versionsArray.length(); i++) {
-                ApiVersion parsedApiVersion = ApiVersion.of(versionsArray.getString(i));
-                for (ApiVersion temp : NotesClient.SUPPORTED_API_VERSIONS) {
-                    if (temp.compareTo(parsedApiVersion) == 0) {
-                        supportedApiVersions.add(parsedApiVersion);
-                        break;
-                    }
-                }
-            }
-            this.preferredApiVersion = Collections.max(supportedApiVersions);
-        } catch (JSONException | NoSuchElementException e) {
-            e.printStackTrace();
-            this.preferredApiVersion = null;
-        }
-    }
-
-    public int getColor() {
-        return color;
-    }
-
-    public void setColor(@ColorInt int color) {
-        this.color = color;
-    }
-
-    public int getTextColor() {
-        return textColor;
-    }
-
-    public void setTextColor(@ColorInt int textColor) {
-        this.textColor = textColor;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return "LocalAccount{" +
-                "id=" + id +
-                ", userName='" + userName + '\'' +
-                ", accountName='" + accountName + '\'' +
-                ", url='" + url + '\'' +
-                ", etag='" + etag + '\'' +
-                ", modified=" + modified +
-                ", preferredApiVersion='" + preferredApiVersion + '\'' +
-                ", color=" + color +
-                ", textColor=" + textColor +
-                ", capabilitiesETag=" + capabilitiesETag +
-                '}';
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
index 1547a352..550879f6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
@@ -32,7 +32,7 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
     private final int appWidgetId;
 
     private NotesRoomDatabase db;
-    private DBNote note;
+    private NoteEntity note;
     private boolean darkModeActive = false;
 
     private static final String TAG = SingleNoteWidget.class.getSimpleName();
@@ -65,7 +65,7 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
             final WidgetSingleNoteEntity data = db.getWidgetSingleNoteDao().getSingleNoteWidgetData(appWidgetId);
             final long noteId = data.getNoteId();
             Log.v(TAG, "Fetch note with id " + noteId);
-            note = NoteEntity.entityToDBNote(db.getNoteDao().getNote(data.getAccountId(), noteId));
+            note = db.getNoteDao().getNote(data.getAccountId(), noteId);
 
             if (note == null) {
                 Log.e(TAG, "Error: note not found");