From 5c453f7dffa9d70eca604293f3b28abe49c024b3 Mon Sep 17 00:00:00 2001 From: nuclearfog Date: Thu, 7 Sep 2023 20:31:49 +0200 Subject: [PATCH] filter bug fix --- .../twidda/backend/helper/update/FilterUpdate.java | 2 +- .../java/org/nuclearfog/twidda/model/Filter.java | 2 +- .../nuclearfog/twidda/ui/dialogs/FilterDialog.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/helper/update/FilterUpdate.java b/app/src/main/java/org/nuclearfog/twidda/backend/helper/update/FilterUpdate.java index 2f8af363..d1b9e74f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/helper/update/FilterUpdate.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/helper/update/FilterUpdate.java @@ -38,7 +38,7 @@ public class FilterUpdate implements Serializable { * @param filter existing filter */ public FilterUpdate(Filter filter) { - int expires_at = (int) (filter.getExpirationTime() - System.currentTimeMillis()); + int expires_at = (int) ((filter.getExpirationTime() - System.currentTimeMillis()) / 1000L); Keyword[] keywords = filter.getKeywords(); id = filter.getId(); title = filter.getTitle(); diff --git a/app/src/main/java/org/nuclearfog/twidda/model/Filter.java b/app/src/main/java/org/nuclearfog/twidda/model/Filter.java index a43e3222..a795bf72 100644 --- a/app/src/main/java/org/nuclearfog/twidda/model/Filter.java +++ b/app/src/main/java/org/nuclearfog/twidda/model/Filter.java @@ -36,7 +36,7 @@ public interface Filter extends Serializable { /** * get date time where the filter expires * - * @return date time or '0' if not defined + * @return ISO 8601 Datetime or '0' if not defined */ long getExpirationTime(); diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/dialogs/FilterDialog.java b/app/src/main/java/org/nuclearfog/twidda/ui/dialogs/FilterDialog.java index defb499c..93dfe2c5 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/dialogs/FilterDialog.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/dialogs/FilterDialog.java @@ -129,14 +129,14 @@ public class FilterDialog extends Dialog implements OnClickListener, OnCheckedCh sw_thread.setCheckedImmediately(update.filterThreadSet()); sw_hide.setCheckedImmediately(update.getFilterAction() == Filter.ACTION_HIDE); txt_title.setText(update.getTitle()); - if (update.getExpirationTime() > 86400000L) { - txt_duration.setText(Long.toString(Math.round(update.getExpirationTime() / 86400000d))); + if (update.getExpirationTime() > 86400) { + txt_duration.setText(Long.toString(Math.round(update.getExpirationTime() / 86400d))); timeunit.setSelection(2); - } else if (update.getExpirationTime() > 3600000L) { - txt_duration.setText(Long.toString(Math.round(update.getExpirationTime() / 3600000d))); + } else if (update.getExpirationTime() > 3600) { + txt_duration.setText(Long.toString(Math.round(update.getExpirationTime() / 3600d))); timeunit.setSelection(1); - } else if (update.getExpirationTime() > 60000L) { - txt_duration.setText(Long.toString(Math.round(update.getExpirationTime() / 60000d))); + } else if (update.getExpirationTime() > 60) { + txt_duration.setText(Long.toString(Math.round(update.getExpirationTime() / 60d))); timeunit.setSelection(0); } else { timeunit.setSelection(2);