#831 Migrate from SQLiteOpenHelper to Room

Remove old SqliteOpenHelper database

8 files changed, 17 insertions, 17 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserAdapter.java
index 6d831be3..35d28d6f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserAdapter.java
@@ -11,18 +11,15 @@ import java.util.List;
 
 import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;
 import it.niedermann.owncloud.notes.persistence.entity.LocalAccountEntity;
-import it.niedermann.owncloud.notes.shared.model.LocalAccount;
-
-import static it.niedermann.owncloud.notes.persistence.entity.LocalAccountEntity.entityToLocalAccount;
 
 public class AccountChooserAdapter extends RecyclerView.Adapter<AccountChooserViewHolder> {
 
     @NonNull
     private final List<LocalAccountEntity> localAccounts;
     @NonNull
-    private final Consumer<LocalAccount> targetAccountConsumer;
+    private final Consumer<LocalAccountEntity> targetAccountConsumer;
 
-    public AccountChooserAdapter(@NonNull List<LocalAccountEntity> localAccounts, @NonNull Consumer<LocalAccount> targetAccountConsumer) {
+    public AccountChooserAdapter(@NonNull List<LocalAccountEntity> localAccounts, @NonNull Consumer<LocalAccountEntity> targetAccountConsumer) {
         super();
         this.localAccounts = localAccounts;
         this.targetAccountConsumer = targetAccountConsumer;
@@ -36,7 +33,7 @@ public class AccountChooserAdapter extends RecyclerView.Adapter<AccountChooserVi
 
     @Override
     public void onBindViewHolder(@NonNull AccountChooserViewHolder holder, int position) {
-        holder.bind(entityToLocalAccount(localAccounts.get(position)), targetAccountConsumer);
+        holder.bind(localAccounts.get(position), targetAccountConsumer);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java
index 9fc2f382..de95250c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java
@@ -11,7 +11,7 @@ import com.bumptech.glide.request.RequestOptions;
 import it.niedermann.android.glidesso.SingleSignOnUrl;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;
-import it.niedermann.owncloud.notes.shared.model.LocalAccount;
+import it.niedermann.owncloud.notes.persistence.entity.LocalAccountEntity;
 
 public class AccountChooserViewHolder extends RecyclerView.ViewHolder {
     private final ItemAccountChooseBinding binding;
@@ -21,17 +21,17 @@ public class AccountChooserViewHolder extends RecyclerView.ViewHolder {
         this.binding = binding;
     }
 
-    public void bind(LocalAccount localAccount, Consumer<LocalAccount> targetAccountConsumer) {
+    public void bind(LocalAccountEntity localAccount, Consumer<LocalAccountEntity> targetAccountConsumer) {
         Glide
                 .with(binding.accountItemAvatar.getContext())
-                .load(new SingleSignOnUrl(localAccount.getAccountName(), localAccount.getUrl() + "/index.php/avatar/" + Uri.encode(localAccount.getUserName()) + "/64"))
+                .load(new SingleSignOnUrl(localAccount.getAccountName(), localAccount.getUrl() + "/index.php/avatar/" + Uri.encode(localAccount.getUsername()) + "/64"))
                 .placeholder(R.drawable.ic_account_circle_grey_24dp)
                 .error(R.drawable.ic_account_circle_grey_24dp)
                 .apply(RequestOptions.circleCropTransform())
                 .into(binding.accountItemAvatar);
 
         binding.accountLayout.setOnClickListener((v) -> targetAccountConsumer.accept(localAccount));
-        binding.accountName.setText(localAccount.getUserName());
+        binding.accountName.setText(localAccount.getUsername());
         binding.accountHost.setText(Uri.parse(localAccount.getUrl()).getHost());
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java
index cf6c51e8..6ba3a943 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java
@@ -13,6 +13,7 @@ import it.niedermann.owncloud.notes.shared.util.NoteUtil;
  * CloudNote represents a remote note from an OwnCloud server.
  * It can be directly generated from the JSON answer from the server.
  */
+@Deprecated
 public class CloudNote implements Serializable {
     private long remoteId;
     private String title = "";
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/DBNote.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/DBNote.java
index 059a1ce3..5ec1434d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/DBNote.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/DBNote.java
@@ -9,6 +9,7 @@ import java.util.Calendar;
  * DBNote represents a single note from the local SQLite database with all attributes.
  * It extends CloudNote with attributes required for local data management.
  */
+@Deprecated
 public class DBNote extends CloudNote implements Item, Serializable {
 
     private final long id;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DatabaseIndexUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DatabaseIndexUtil.java
index 235711ef..59707b24 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DatabaseIndexUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DatabaseIndexUtil.java
@@ -14,8 +14,8 @@ public class DatabaseIndexUtil {
 
     }
 
-    public static void createIndex(@NonNull SQLiteDatabase db, @NonNull String table, @NonNull String ...columns) {
-        for (String column: columns) {
+    public static void createIndex(@NonNull SQLiteDatabase db, @NonNull String table, @NonNull String... columns) {
+        for (String column : columns) {
             createIndex(db, table, column);
         }
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
index 014d3377..9254de82 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
@@ -91,7 +91,7 @@ public class NoteUtil {
     @NonNull
     public static String generateNoteExcerpt(@NonNull String content, @Nullable String title) {
         content = removeMarkDown(content.trim());
-        if(TextUtils.isEmpty(content)) {
+        if (TextUtils.isEmpty(content)) {
             return "";
         }
         if (!TextUtils.isEmpty(title)) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
index ac4c3680..a8c6926e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
@@ -3,13 +3,13 @@ package it.niedermann.owncloud.notes.shared.util.text;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import androidx.annotation.VisibleForTesting;
-
 public class NoteLinksProcessor extends TextProcessor {
 
     private static final String TAG = NoteLinksProcessor.class.getSimpleName();
@@ -28,9 +28,9 @@ public class NoteLinksProcessor extends TextProcessor {
     /**
      * Replaces all links to other notes of the form `[<link-text>](<note-file-id>)`
      * in the markdown string with links to a dummy url.
-     *
+     * <p>
      * Why is this needed?
-     *  See discussion in issue #623
+     * See discussion in issue #623
      *
      * @return Markdown with all note-links replaced with dummy-url-links
      */
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/TextProcessor.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/TextProcessor.java
index 4eb4e4f7..cd17ad17 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/TextProcessor.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/TextProcessor.java
@@ -3,6 +3,7 @@ package it.niedermann.owncloud.notes.shared.util.text;
 abstract public class TextProcessor {
     /**
      * Applies a specified transformation on a text string and returns the updated string.
+     *
      * @param s Text to transform
      * @return Transformed text
      */