diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-07-11 12:16:52 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-07-11 12:16:52 +0300 |
| commit | c21bf132cdba9cbab2d674c7cde25ca84a79784d (patch) | |
| tree | 1a7092630507fd7fb3a0da1353e7680afbdd8e98 | |
| parent | ce18b07b2039c4439341678666bf9fbdbaf65aa9 (diff) | |
version bump to v2.16.4 - fix #902v2.16.4
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java | 11 | ||||
| -rw-r--r-- | fastlane/metadata/android/en-US/changelogs/2016004.txt | 1 |
3 files changed, 6 insertions, 10 deletions
diff --git a/app/build.gradle b/app/build.gradle index b590d896..c056f351 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "it.niedermann.owncloud.notes" minSdkVersion 17 targetSdkVersion 29 - versionCode 2016003 - versionName "2.16.3" + versionCode 2016004 + versionName "2.16.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } 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 ae0e3c88..ddf640ac 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 @@ -325,8 +325,8 @@ public class NotesDatabase extends AbstractNotesDatabase { @Nullable String category, @Nullable Boolean favorite, @Nullable CategorySortingMethod sortingMethod) { validateAccountId(accountId); - List<String> where = new ArrayList<>(); - List<String> args = new ArrayList<>(); + List<String> where = new ArrayList<>(6); + List<String> args = new ArrayList<>(9); where.add(key_status + " != ?"); args.add(DBStatus.LOCAL_DELETED.getTitle()); @@ -357,18 +357,13 @@ public class NotesDatabase extends AbstractNotesDatabase { } String order = category == null ? default_order : key_category + ", " + key_title; - // TODO: modify here, need to test -// if (sortingMethod != null) { -// order = key_favorite + " DESC," + sortingMethod.getSorder(); -// } if (sortingMethod != null) { - if (category != null) { + if (category != null) { // Needed for subcategories, see https://github.com/stefan-niedermann/nextcloud-notes/issues/902 order = key_category + "," + key_favorite + " DESC," + sortingMethod.getSorder(); // Edited } else { order = key_favorite + " DESC," + sortingMethod.getSorder(); } } - Log.e(TAG, "ORDER:::: " + order); return getNotesCustom(accountId, TextUtils.join(" AND ", where), args.toArray(new String[]{}), order, true); } diff --git a/fastlane/metadata/android/en-US/changelogs/2016004.txt b/fastlane/metadata/android/en-US/changelogs/2016004.txt new file mode 100644 index 00000000..77640cb6 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/2016004.txt @@ -0,0 +1 @@ +- 🐞 Fix grouping of notes by subcategory (#902)
\ No newline at end of file |