From efa225c960662b56197d811af9723e15b0d019e2 Mon Sep 17 00:00:00 2001 From: nuclearfog Date: Sun, 7 May 2023 22:40:39 +0200 Subject: [PATCH] bug fix --- .../org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java | 3 ++- .../java/org/nuclearfog/twidda/ui/adapter/DomainAdapter.java | 1 + .../org/nuclearfog/twidda/ui/fragments/DomainFragment.java | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java index 161c0554..905be79f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java @@ -670,7 +670,8 @@ public class Mastodon implements Connection { try { List params = new ArrayList<>(); params.add("limit=" + settings.getListSize()); - params.add("maxId=" + cursor); + if (cursor != 0L) + params.add("max_id=" + cursor); Response response = get(ENDPOINT_DOMAIN_BLOCK, params); ResponseBody body = response.body(); if (response.code() == 200 && body != null) { diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/adapter/DomainAdapter.java b/app/src/main/java/org/nuclearfog/twidda/ui/adapter/DomainAdapter.java index 0245a67b..391e6a86 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/adapter/DomainAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/adapter/DomainAdapter.java @@ -148,6 +148,7 @@ public class DomainAdapter extends Adapter implements OnHolderClickL * @param item domain name item */ public void removeItem(String item) { + disableLoading(); int index = items.indexOf(item); if (index >= 0) { items.remove(index); diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/fragments/DomainFragment.java b/app/src/main/java/org/nuclearfog/twidda/ui/fragments/DomainFragment.java index 51aa200d..03f99279 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/fragments/DomainFragment.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/fragments/DomainFragment.java @@ -12,6 +12,7 @@ import org.nuclearfog.twidda.backend.async.AsyncExecutor.AsyncCallback; import org.nuclearfog.twidda.backend.async.DomainAction; import org.nuclearfog.twidda.backend.async.DomainAction.DomainParam; import org.nuclearfog.twidda.backend.async.DomainAction.DomainResult; +import org.nuclearfog.twidda.backend.utils.ErrorHandler; import org.nuclearfog.twidda.lists.Domains; import org.nuclearfog.twidda.ui.adapter.DomainAdapter; import org.nuclearfog.twidda.ui.adapter.DomainAdapter.OnDomainClickListener; @@ -114,6 +115,10 @@ public class DomainFragment extends ListFragment implements OnDomainClickListene adapter.removeItem(result.domain); Toast.makeText(requireContext(), R.string.info_domain_removed, Toast.LENGTH_SHORT).show(); } + } else if (result.mode == DomainResult.ERROR) { + String message = ErrorHandler.getErrorMessage(getContext(), result.exception); + Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show(); + adapter.disableLoading(); } }