From e9fd84d7eb01f7e9f797d67ab65e73d31ef33e75 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 11 Nov 2022 16:59:16 +0100
Subject: [PATCH 1/2] Release 3.6.4

---
 app/build.gradle                                         | 4 ++--
 app/src/main/assets/release_notes/notes.json             | 5 +++++
 .../fastlane/metadata/android/en/changelogs/425.txt      | 9 +++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/fdroid/fastlane/metadata/android/en/changelogs/425.txt

diff --git a/app/build.gradle b/app/build.gradle
index 1cbbc992b..435d820d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 31
-        versionCode 424
-        versionName "3.6.3"
+        versionCode 425
+        versionName "3.6.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 633185ba7..bc8f05612 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.6.4",
+    "code": "425",
+    "note": "Changed:\n- Tag search ordered by popularity\n\nFixed:\n- Unable to get client ID on some devices\n- Issue with messages/notifications not correctly displayed\n- Notifications not received\n- Friendica: issues with mentions and tags (open browser)\n- Improve sharing behaviour"
+  },
   {
     "version": "3.6.3",
     "code": "424",
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/425.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/425.txt
new file mode 100644
index 000000000..e7dbd9165
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/425.txt
@@ -0,0 +1,9 @@
+Changed:
+- Tag search ordered by popularity
+
+Fixed:
+- Unable to get client ID on some devices
+- Issue with messages/notifications not correctly displayed
+- Notifications not received
+- Friendica: issues with mentions and tags (open browser)
+- Improve sharing behaviour
\ No newline at end of file

From 39c49fad7718c0efe013b83f41b46a10b76decf3 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sat, 12 Nov 2022 09:49:48 +0100
Subject: [PATCH 2/2] Fix crash with trends

---
 .../timeline/FragmentMastodonTag.java         | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java
index fc252f8d3..984c19eb6 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java
@@ -121,19 +121,21 @@ public class FragmentMastodonTag extends Fragment {
             binding.noActionText.setText(R.string.no_tags);
             return;
         }
-        Collections.sort(tags, (obj1, obj2) -> Integer.compare(obj2.getWeight(), obj1.getWeight()));
-        boolean isInCollection = false;
-        for (Tag tag : tags) {
-            if (tag.name.compareToIgnoreCase(search) == 0) {
-                isInCollection = true;
-                break;
+        if (search != null) {
+            Collections.sort(tags, (obj1, obj2) -> Integer.compare(obj2.getWeight(), obj1.getWeight()));
+            boolean isInCollection = false;
+            for (Tag tag : tags) {
+                if (tag.name.compareToIgnoreCase(search) == 0) {
+                    isInCollection = true;
+                    break;
+                }
+            }
+            if (!isInCollection) {
+                Tag tag = new Tag();
+                tag.name = search;
+                tag.history = new ArrayList<>();
+                tags.add(0, tag);
             }
-        }
-        if (!isInCollection) {
-            Tag tag = new Tag();
-            tag.name = search;
-            tag.history = new ArrayList<>();
-            tags.add(0, tag);
         }
         binding.recyclerView.setVisibility(View.VISIBLE);
         binding.noAction.setVisibility(View.GONE);