From f2a4fdb2dbec9907a12696e57e7eeea7effc0bae Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 18 Nov 2022 19:17:58 +0100
Subject: [PATCH] Release 3.7.2

---
 app/build.gradle                                             | 4 ++--
 app/src/main/assets/release_notes/notes.json                 | 5 +++++
 .../java/app/fedilab/android/activities/FilterActivity.java  | 2 +-
 src/fdroid/fastlane/metadata/android/en/changelogs/429.txt   | 2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 src/fdroid/fastlane/metadata/android/en/changelogs/429.txt

diff --git a/app/build.gradle b/app/build.gradle
index 3d12eed43..6b3254a49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 31
-        versionCode 428
-        versionName "3.7.1"
+        versionCode 429
+        versionName "3.7.2"
         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 9c342fcb4..28f4e1d63 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.7.2",
+    "code": "429",
+    "note": "Added:\n- Full support to new filters for Mastodon 4"
+  },
   {
     "version": "3.7.1",
     "code": "428",
diff --git a/app/src/main/java/app/fedilab/android/activities/FilterActivity.java b/app/src/main/java/app/fedilab/android/activities/FilterActivity.java
index bb12cfa0c..91d3688c0 100644
--- a/app/src/main/java/app/fedilab/android/activities/FilterActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/FilterActivity.java
@@ -189,7 +189,7 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete
 
                 boolean canBeSent = true;
                 for (int i = 0; i < filterParams.keywords.size(); i++) {
-                    if (filterParams.keywords.get(i).keyword.trim().isEmpty() && !filterParams.keywords.get(i)._destroy) {
+                    if (filterParams.keywords.get(i).keyword == null || (filterParams.keywords.get(i).keyword.trim().isEmpty() && filterParams.keywords.get(i)._destroy != null && !filterParams.keywords.get(i)._destroy)) {
                         canBeSent = false;
                     }
                 }
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/429.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/429.txt
new file mode 100644
index 000000000..448bff8a8
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/429.txt
@@ -0,0 +1,2 @@
+Added:
+- Full support to new filters for Mastodon 4
\ No newline at end of file