From f4bfe12abe507e42f6747637f2f87b2856148722 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 20 Sep 2022 11:43:47 +0200
Subject: [PATCH] Fix issue #326

---
 .../fedilab/android/activities/FilterActivity.java   | 12 ++++++++----
 .../client/endpoints/MastodonAccountsService.java    |  4 ++--
 .../fedilab/android/ui/drawer/ComposeAdapter.java    |  2 --
 .../android/viewmodel/mastodon/AccountsVM.java       |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

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 9f6d29b34..45991b3dd 100644
--- a/app/src/main/java/app/fedilab/android/activities/FilterActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/FilterActivity.java
@@ -78,18 +78,21 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete
                         expire[0] = -1;
                         break;
                     case 1:
-                        expire[0] = 3600;
+                        expire[0] = 1800;
                         break;
                     case 2:
-                        expire[0] = 21600;
+                        expire[0] = 3600;
                         break;
                     case 3:
-                        expire[0] = 43200;
+                        expire[0] = 21600;
                         break;
                     case 4:
-                        expire[0] = 86400;
+                        expire[0] = 43200;
                         break;
                     case 5:
+                        expire[0] = 86400;
+                        break;
+                    case 6:
                         expire[0] = 604800;
                         break;
                 }
@@ -99,6 +102,7 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete
             public void onNothingSelected(AdapterView<?> parent1) {
             }
         });
+
         if (filter != null) {
             popupAddFilterBinding.addPhrase.setText(filter.phrase);
             if (filter.context != null)
diff --git a/app/src/main/java/app/fedilab/android/client/endpoints/MastodonAccountsService.java b/app/src/main/java/app/fedilab/android/client/endpoints/MastodonAccountsService.java
index 9f13b25f6..50abe4f2f 100644
--- a/app/src/main/java/app/fedilab/android/client/endpoints/MastodonAccountsService.java
+++ b/app/src/main/java/app/fedilab/android/client/endpoints/MastodonAccountsService.java
@@ -339,7 +339,7 @@ public interface MastodonAccountsService {
             @Field("context[]") List<String> context,
             @Field("irreversible") boolean irreversible,
             @Field("whole_word") boolean whole_word,
-            @Field("expires_in") long expires_in
+            @Field("expires_in") String expires_in
     );
 
     //Edit a filter
@@ -352,7 +352,7 @@ public interface MastodonAccountsService {
             @Field("context[]") List<String> context,
             @Field("irreversible") boolean irreversible,
             @Field("whole_word") boolean whole_word,
-            @Field("expires_in") long expires_in
+            @Field("expires_in") String expires_in
     );
 
     //Remove a filter
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index 7fa49c260..3c0a081e7 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -56,7 +56,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.appcompat.widget.LinearLayoutCompat;
@@ -560,7 +559,6 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                                 .asBitmap()
                                 .load(attachmentPath)
                                 .into(new CustomTarget<Bitmap>() {
-                                    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
                                     @Override
                                     public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
                                         popupMediaDescriptionBinding.mediaPicture.setImageBitmap(resource);
diff --git a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java
index 0c9868ba4..69e6cd05a 100644
--- a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java
+++ b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java
@@ -1164,7 +1164,7 @@ public class AccountsVM extends AndroidViewModel {
         MastodonAccountsService mastodonAccountsService = init(instance);
         new Thread(() -> {
             Filter filter = null;
-            Call<Filter> addFilterCall = mastodonAccountsService.addFilter(token, phrase, filterContext, irreversible, wholeWord, expiresIn);
+            Call<Filter> addFilterCall = mastodonAccountsService.addFilter(token, phrase, filterContext, irreversible, wholeWord, expiresIn == -1 ? "" : String.valueOf(expiresIn));
             if (addFilterCall != null) {
                 try {
                     Response<Filter> addFiltersResponse = addFilterCall.execute();
@@ -1199,7 +1199,7 @@ public class AccountsVM extends AndroidViewModel {
         MastodonAccountsService mastodonAccountsService = init(instance);
         new Thread(() -> {
             Filter filter = null;
-            Call<Filter> editFilterCall = mastodonAccountsService.editFilter(token, id, phrase, filterContext, irreversible, wholeWord, expiresIn);
+            Call<Filter> editFilterCall = mastodonAccountsService.editFilter(token, id, phrase, filterContext, irreversible, wholeWord, expiresIn == -1 ? "" : String.valueOf(expiresIn));
             if (editFilterCall != null) {
                 try {
                     Response<Filter> editFiltersResponse = editFilterCall.execute();