Fix unit tests

3 files changed, 12 insertions, 7 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
index 67e9f921..16e1004b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
@@ -37,7 +37,6 @@ import java.util.List;
 import java.util.Map;
 
 import it.niedermann.android.sharedpreferences.SharedPreferenceIntLiveData;
-import it.niedermann.android.sharedpreferences.SharedPreferenceStringLiveData;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.edit.EditNoteActivity;
 import it.niedermann.owncloud.notes.persistence.dao.AccountDao;
@@ -461,7 +460,7 @@ public abstract class NotesDatabase extends RoomDatabase {
         new Thread(() -> {
             final Context ctx = context.getApplicationContext();
             final SharedPreferences.Editor sp = PreferenceManager.getDefaultSharedPreferences(ctx).edit();
-            int orderIndex = sortingMethod.getCSMID();
+            int orderIndex = sortingMethod.getId();
 
             switch (selectedCategory.getType()) {
                 case FAVORITES: {
@@ -542,7 +541,7 @@ public abstract class NotesDatabase extends RoomDatabase {
             }
         }
 
-        return map(new SharedPreferenceIntLiveData(sp, prefKey, CategorySortingMethod.SORT_MODIFIED_DESC.getCSMID()), CategorySortingMethod::getCSM);
+        return map(new SharedPreferenceIntLiveData(sp, prefKey, CategorySortingMethod.SORT_MODIFIED_DESC.getId()), CategorySortingMethod::findById);
     }
 
     public Context getContext() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Converters.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Converters.java
index 42d1e881..1984df40 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Converters.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Converters.java
@@ -1,5 +1,6 @@
 package it.niedermann.owncloud.notes.persistence.entity;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.room.TypeConverter;
 
@@ -26,13 +27,15 @@ public class Converters {
     }
 
     @TypeConverter
-    public static CategorySortingMethod categorySortingMethodFromString(Integer value) {
-        return value == null ? CategorySortingMethod.SORT_MODIFIED_DESC : CategorySortingMethod.getCSM(value);
+    @NonNull
+    public static CategorySortingMethod categorySortingMethodFromString(@Nullable Integer value) {
+        return value == null ? CategorySortingMethod.SORT_MODIFIED_DESC : CategorySortingMethod.findById(value);
     }
 
     @TypeConverter
-    public static Integer dbStatusToString(CategorySortingMethod categorySortingMethod) {
-        return categorySortingMethod == null ? null : categorySortingMethod.getCSMID();
+    @Nullable
+    public static Integer dbStatusToString(@Nullable CategorySortingMethod categorySortingMethod) {
+        return categorySortingMethod == null ? null : categorySortingMethod.getId();
     }
 
     @TypeConverter
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_19_20.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_19_20.java
index 48ddd9eb..36630d8d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_19_20.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_19_20.java
@@ -26,13 +26,16 @@ public final class Migration_19_20 extends Migration {
     @Override
     public void migrate(@NonNull SupportSQLiteDatabase db) {
         dropOldIndices(db);
+
         createNewTables(db);
         createNewIndices(db);
+
         migrateAccounts(db);
         migrateCategories(db);
         migrateNotes(db);
         migrateNotesListWidgets(db);
         migrateSingleNotesWidgets(db);
+
         dropOldTables(db);
     }