From 1c31f1b9d1dec74141fe2d333e9113b4c8c3df05 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 16 Jun 2020 18:23:13 +0200 Subject: [PATCH] Some fixes --- .../asynctasks/RetrieveFeedsAsyncTask.java | 6 ++-- .../android/client/Entities/Status.java | 35 +------------------ .../android/drawers/AccountLiveAdapter.java | 2 +- .../drawers/AccountsAdminListAdapter.java | 2 +- .../drawers/AccountsFollowRequestAdapter.java | 2 +- .../drawers/AccountsInAListAdapter.java | 2 +- .../android/drawers/AccountsListAdapter.java | 2 +- .../android/drawers/ArtListAdapter.java | 2 +- .../android/drawers/DomainsListAdapter.java | 2 +- .../drawers/IdentityProofsAdapter.java | 2 +- .../fedilab/android/drawers/ImageAdapter.java | 2 +- .../drawers/InstancePeertubeRegAdapter.java | 2 +- .../android/drawers/InstanceRegAdapter.java | 2 +- .../drawers/NotificationsListAdapter.java | 7 ++-- .../android/drawers/PeertubeAdapter.java | 2 +- .../PeertubeNotificationsListAdapter.java | 2 +- .../android/drawers/PixelfedListAdapter.java | 2 +- .../drawers/PixelfedStoriesListAdapter.java | 2 +- .../android/drawers/ReactionAdapter.java | 2 +- .../android/drawers/ReportsListAdapter.java | 2 +- .../android/drawers/StatusListAdapter.java | 7 ++-- .../android/drawers/SuggestionsAdapter.java | 2 +- .../android/drawers/TagsEditAdapter.java | 2 +- 23 files changed, 31 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java index 1d0bb7777..68d3519bf 100644 --- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java +++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java @@ -17,6 +17,7 @@ package app.fedilab.android.asynctasks; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.os.AsyncTask; +import android.util.Log; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -35,6 +36,7 @@ import app.fedilab.android.client.Entities.Status; import app.fedilab.android.client.GNUAPI; import app.fedilab.android.client.PeertubeAPI; import app.fedilab.android.helper.FilterToots; +import app.fedilab.android.helper.Helper; import app.fedilab.android.interfaces.OnRetrieveFeedsInterface; import app.fedilab.android.sqlite.InstancesDAO; import app.fedilab.android.sqlite.PeertubeFavoritesDAO; @@ -369,13 +371,11 @@ public class RetrieveFeedsAsyncTask extends AsyncTask { db = Sqlite.getInstance(contextReference.get().getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); List statuses = new StatusCacheDAO(contextReference.get(), db).getAllStatus(StatusCacheDAO.BOOKMARK_CACHE); if (statuses != null) { + for (app.fedilab.android.client.Entities.Status status : statuses) { app.fedilab.android.client.Entities.Status.fillSpan(contextReference, status); app.fedilab.android.client.Entities.Status.makeEmojiPoll(contextReference, status.getReblog() != null ? status.getReblog().getPoll() : status.getPoll()); Account.makeAccountNameEmoji(contextReference, status.getReblog() != null ? status.getReblog().getAccount() : status.getAccount()); - if( status.getPoll() != null) { - app.fedilab.android.client.Entities.Status.makeEmojiPoll(contextReference, status.getPoll()); - } } } else { statuses = new ArrayList<>(); diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java index 76b131954..814787918 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java @@ -917,17 +917,6 @@ public class Status implements Parcelable { Glide.with(context) .asDrawable() .load(disableAnimatedEmoji ? emoji.getStatic_url() : emoji.getUrl()) - .listener(new RequestListener() { - @Override - public boolean onResourceReady(Drawable resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { - return false; - } - - @Override - public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { - return false; - } - }) .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { @@ -936,7 +925,7 @@ public class Status implements Parcelable { //emojis can be used several times so we have to loop for (int startPosition = -1; (startPosition = contentSpan.toString().indexOf(targetedEmoji, startPosition + 1)) != -1; startPosition++) { final int endPosition = startPosition + targetedEmoji.length(); - if (resource != null && endPosition <= contentSpan.toString().length() && endPosition >= startPosition) { + if (endPosition <= contentSpan.toString().length() && endPosition >= startPosition) { ImageSpan imageSpan; try { resource.setBounds(0, 0, (int) Helper.convertDpToPixel(20, context), (int) Helper.convertDpToPixel(20, context)); @@ -994,17 +983,6 @@ public class Status implements Parcelable { Glide.with(context) .asDrawable() .load(disableAnimatedEmoji ? emoji.getStatic_url() : emoji.getUrl()) - .listener(new RequestListener() { - @Override - public boolean onResourceReady(Drawable resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { - return false; - } - - @Override - public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { - return false; - } - }) .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { @@ -1056,17 +1034,6 @@ public class Status implements Parcelable { Glide.with(context) .asBitmap() .load(imgURL) - .listener(new RequestListener() { - @Override - public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { - return false; - } - - @Override - public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { - return false; - } - }) .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountLiveAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountLiveAdapter.java index ae5f6f49d..2aab38acd 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountLiveAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountLiveAdapter.java @@ -40,7 +40,7 @@ import static android.content.Context.MODE_PRIVATE; * Created by Thomas on 03/10/2019 * Adapter for accounts and live notifications */ -public class AccountLiveAdapter extends RecyclerView.Adapter { +public class AccountLiveAdapter extends RecyclerView.Adapter { private Context context; private List accounts; diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsAdminListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsAdminListAdapter.java index 8e9ac1926..f85187202 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsAdminListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsAdminListAdapter.java @@ -41,7 +41,7 @@ import app.fedilab.android.interfaces.OnRetrieveEmojiAccountInterface; * Created by Thomas on 19/06/2019. * Adapter for account admins */ -public class AccountsAdminListAdapter extends RecyclerView.Adapter implements OnRetrieveEmojiAccountInterface { +public class AccountsAdminListAdapter extends RecyclerView.Adapter implements OnRetrieveEmojiAccountInterface { private List accountAdmins; private Context context; diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java index 28248f1f7..b81731d6e 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java @@ -55,7 +55,7 @@ import es.dmoral.toasty.Toasty; * Created by Thomas on 07/05/2017. * Adapter for accounts asking a follow request */ -public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implements OnPostActionInterface { +public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implements OnPostActionInterface { private List accounts; private Context context; diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java index eb1edc97a..2d8147cef 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java @@ -50,7 +50,7 @@ import es.dmoral.toasty.Toasty; * Created by Thomas on 15/12/2017. * Adapter for accounts in lists */ -public class AccountsInAListAdapter extends RecyclerView.Adapter implements OnListActionInterface { +public class AccountsInAListAdapter extends RecyclerView.Adapter implements OnListActionInterface { private List accounts; private Context context; diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java index 3cac8a987..4aa6aa4c9 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java @@ -65,7 +65,7 @@ import es.dmoral.toasty.Toasty; * Created by Thomas on 27/04/2017. * Adapter for accounts */ -public class AccountsListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveEmojiAccountInterface { +public class AccountsListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveEmojiAccountInterface { private List accounts; private RetrieveAccountsAsyncTask.Type action; diff --git a/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java index 859b8b011..ead793dc4 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java @@ -64,7 +64,7 @@ import static android.content.Context.MODE_PRIVATE; * Created by Thomas on 14/01/2019. * Adapter for art drawer */ -public class ArtListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveEmojiInterface, OnRetrieveRepliesInterface { +public class ArtListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveEmojiInterface, OnRetrieveRepliesInterface { private static final int DISPLAYED_STATUS = 1; private final int HIDDEN_STATUS = 0; diff --git a/app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java index c58308531..f2c9861e8 100644 --- a/app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java @@ -43,7 +43,7 @@ import es.dmoral.toasty.Toasty; * Created by Thomas on 26/09/2018. * Adapter for domains */ -public class DomainsListAdapter extends RecyclerView.Adapter implements OnRetrieveDomainsInterface { +public class DomainsListAdapter extends RecyclerView.Adapter implements OnRetrieveDomainsInterface { private List domains; private Context context; diff --git a/app/src/main/java/app/fedilab/android/drawers/IdentityProofsAdapter.java b/app/src/main/java/app/fedilab/android/drawers/IdentityProofsAdapter.java index b5c796339..ba0e32f4f 100644 --- a/app/src/main/java/app/fedilab/android/drawers/IdentityProofsAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/IdentityProofsAdapter.java @@ -35,7 +35,7 @@ import app.fedilab.android.helper.Helper; * Created by Thomas on 19/12/2019. * Adapter for identity proofs */ -public class IdentityProofsAdapter extends RecyclerView.Adapter { +public class IdentityProofsAdapter extends RecyclerView.Adapter { private Context context; private List identityProofs; diff --git a/app/src/main/java/app/fedilab/android/drawers/ImageAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ImageAdapter.java index 8c4b76b14..9a43d83e1 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ImageAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ImageAdapter.java @@ -43,7 +43,7 @@ import app.fedilab.android.client.Entities.Status; * Adapter to display media related to status */ -public class ImageAdapter extends RecyclerView.Adapter { +public class ImageAdapter extends RecyclerView.Adapter { private Context context; private List statuses; diff --git a/app/src/main/java/app/fedilab/android/drawers/InstancePeertubeRegAdapter.java b/app/src/main/java/app/fedilab/android/drawers/InstancePeertubeRegAdapter.java index 26c877a7e..8a31854ca 100644 --- a/app/src/main/java/app/fedilab/android/drawers/InstancePeertubeRegAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/InstancePeertubeRegAdapter.java @@ -37,7 +37,7 @@ import app.fedilab.android.helper.Helper; * Adapter to display instances */ -public class InstancePeertubeRegAdapter extends RecyclerView.Adapter { +public class InstancePeertubeRegAdapter extends RecyclerView.Adapter { private Context context; private List instanceRegs; private LayoutInflater layoutInflater; diff --git a/app/src/main/java/app/fedilab/android/drawers/InstanceRegAdapter.java b/app/src/main/java/app/fedilab/android/drawers/InstanceRegAdapter.java index 119ec3ed6..9763fd30e 100644 --- a/app/src/main/java/app/fedilab/android/drawers/InstanceRegAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/InstanceRegAdapter.java @@ -43,7 +43,7 @@ import app.fedilab.android.helper.Helper; * Adapter to display instances */ -public class InstanceRegAdapter extends RecyclerView.Adapter { +public class InstanceRegAdapter extends RecyclerView.Adapter { private Context context; private List instanceRegs; private LayoutInflater layoutInflater; diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index e1d77bce0..c5bdceaf7 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -118,7 +118,7 @@ import static app.fedilab.android.activities.BaseMainActivity.social; * Adapter for Status */ -public class NotificationsListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnPostNotificationsActionInterface, OnRetrieveEmojiInterface, OnRetrieveEmojiAccountInterface, OnPollInterface, OnRetrieveImageInterface { +public class NotificationsListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnPostNotificationsActionInterface, OnRetrieveEmojiInterface, OnRetrieveEmojiAccountInterface, OnPollInterface, OnRetrieveImageInterface { private final Object lock = new Object(); private Context context; @@ -539,7 +539,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On TextView poll_item_percent = item.findViewById(R.id.poll_item_percent); TextView poll_item_text = item.findViewById(R.id.poll_item_text); ProgressBar poll_item_value = item.findViewById(R.id.poll_item_value); - poll_item_percent.setText(String.format("%s %%", String.valueOf((int) value))); + poll_item_percent.setText(String.format("%s %%", (int) value)); poll_item_text.setText(pollOption.getTitle(), TextView.BufferType.SPANNABLE); poll_item_value.setProgress((int) value); holder.rated.addView(item); @@ -1046,13 +1046,12 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On * @param notification Notification */ private void displayConfirmationNotificationDialog(final Notification notification) { - final ArrayList seletedItems = new ArrayList(); + final ArrayList seletedItems = new ArrayList<>(); AlertDialog dialog = new AlertDialog.Builder(context, style) .setTitle(R.string.delete_notification_ask) .setMultiChoiceItems(new String[]{context.getString(R.string.delete_notification_ask_all)}, null, (dialog1, indexSelected, isChecked) -> { if (isChecked) { - //noinspection unchecked seletedItems.add(indexSelected); } else { if (seletedItems.contains(indexSelected)) diff --git a/app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java index 19d621394..58c218771 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java @@ -55,7 +55,7 @@ import app.fedilab.android.interfaces.OnListActionInterface; * Created by Thomas on 06/10/2018. * Adapter for peertube */ -public class PeertubeAdapter extends RecyclerView.Adapter implements OnListActionInterface { +public class PeertubeAdapter extends RecyclerView.Adapter implements OnListActionInterface { private List peertubes; private Context context; diff --git a/app/src/main/java/app/fedilab/android/drawers/PeertubeNotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PeertubeNotificationsListAdapter.java index 5944dd4d8..a579da4d0 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PeertubeNotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PeertubeNotificationsListAdapter.java @@ -48,7 +48,7 @@ import app.fedilab.android.helper.Helper; * Adapter for Peertube notifications */ -public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter { +public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter { private Context context; private List notifications; diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java index b9fe42e2e..a0f082b98 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -120,7 +120,7 @@ import static app.fedilab.android.activities.BaseMainActivity.social; * Created by Thomas on 14/01/2019. * Adapter for pixelfed drawer */ -public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveEmojiInterface, OnPostStatusActionInterface, OnRetrieveSearchInterface, OnRetrieveSearcAccountshInterface, OnRetrieveContextInterface, OnRetrieveFeedsInterface { +public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveEmojiInterface, OnPostStatusActionInterface, OnRetrieveSearchInterface, OnRetrieveSearcAccountshInterface, OnRetrieveContextInterface, OnRetrieveFeedsInterface { private static final int DISPLAYED_STATUS = 1; private final int HIDDEN_STATUS = 0; diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedStoriesListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedStoriesListAdapter.java index 6731b7941..d53f1a544 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedStoriesListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedStoriesListAdapter.java @@ -56,7 +56,7 @@ import app.fedilab.android.helper.Helper; * Created by Thomas on 02/11/2019. * Adapter for pixelfed stories drawer */ -public class PixelfedStoriesListAdapter extends RecyclerView.Adapter { +public class PixelfedStoriesListAdapter extends RecyclerView.Adapter { private static final int DISPLAYED_STATUS = 1; private Context context; diff --git a/app/src/main/java/app/fedilab/android/drawers/ReactionAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ReactionAdapter.java index 5ce6500be..f37622b79 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ReactionAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ReactionAdapter.java @@ -46,7 +46,7 @@ import app.fedilab.android.interfaces.OnPostActionInterface; * Created by Thomas on 10/03/2020. * Adapter for reactions on messages */ -public class ReactionAdapter extends RecyclerView.Adapter implements OnPostActionInterface { +public class ReactionAdapter extends RecyclerView.Adapter implements OnPostActionInterface { private List reactions; private RetrieveFeedsAsyncTask.Type type; diff --git a/app/src/main/java/app/fedilab/android/drawers/ReportsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ReportsListAdapter.java index 87811bfc3..8dc5c21d3 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ReportsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ReportsListAdapter.java @@ -41,7 +41,7 @@ import app.fedilab.android.interfaces.OnRetrieveEmojiAccountInterface; * Created by Thomas on 19/06/2019. * Adapter for reports */ -public class ReportsListAdapter extends RecyclerView.Adapter implements OnRetrieveEmojiAccountInterface { +public class ReportsListAdapter extends RecyclerView.Adapter implements OnRetrieveEmojiAccountInterface { private List reports; private Context context; diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 4c7da76a2..da4625f70 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -197,7 +197,7 @@ import static app.fedilab.android.activities.BaseMainActivity.social; * Created by Thomas on 24/04/2017. * Adapter for Status */ -public class StatusListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveFeedsInterface, OnRetrieveImageInterface, OnRetrieveEmojiInterface, OnRetrieveRepliesInterface, OnRetrieveCardInterface, OnPollInterface, OnRefreshCachedStatusInterface, OnRetrieveSearcAccountshInterface, OnRetrieveSearchInterface, OnPostStatusActionInterface, OnRetrieveRelationshipQuickReplyInterface, OnSyncBookmarksInterface { +public class StatusListAdapter extends RecyclerView.Adapter implements OnPostActionInterface, OnRetrieveFeedsInterface, OnRetrieveImageInterface, OnRetrieveEmojiInterface, OnRetrieveRepliesInterface, OnRetrieveCardInterface, OnPollInterface, OnRefreshCachedStatusInterface, OnRetrieveSearcAccountshInterface, OnRetrieveSearchInterface, OnPostStatusActionInterface, OnRetrieveRelationshipQuickReplyInterface, OnSyncBookmarksInterface { public static final int DISPLAYED_STATUS = 1; public static final int COMPACT_STATUS = 3; @@ -755,7 +755,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct TextView poll_item_percent = item.findViewById(R.id.poll_item_percent); TextView poll_item_text = item.findViewById(R.id.poll_item_text); ProgressBar poll_item_value = item.findViewById(R.id.poll_item_value); - poll_item_percent.setText(String.format("%s %%", String.valueOf((int) value))); + poll_item_percent.setText(String.format("%s %%", (int) value)); poll_item_text.setText(pollOption.getTitle(), TextView.BufferType.SPANNABLE); poll_item_value.setProgress((int) value); holder.rated.addView(item); @@ -1704,6 +1704,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.fetch_more.setVisibility(View.GONE); } + if( type == RetrieveFeedsAsyncTask.Type.CONTEXT ){ + holder.fetch_more.setVisibility(View.GONE); + } if (status.getMentions() != null) holder.status_mention_spoiler.setText(Helper.makeMentionsClick(context, status.getMentions()), TextView.BufferType.SPANNABLE); diff --git a/app/src/main/java/app/fedilab/android/drawers/SuggestionsAdapter.java b/app/src/main/java/app/fedilab/android/drawers/SuggestionsAdapter.java index 6a31f3fd8..966154742 100644 --- a/app/src/main/java/app/fedilab/android/drawers/SuggestionsAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/SuggestionsAdapter.java @@ -35,7 +35,7 @@ import app.fedilab.android.helper.Helper; * Created by Thomas on 19/07/2019. * Adapter for suggestions results */ -public class SuggestionsAdapter extends RecyclerView.Adapter { +public class SuggestionsAdapter extends RecyclerView.Adapter { private Context context; private List suggestions; diff --git a/app/src/main/java/app/fedilab/android/drawers/TagsEditAdapter.java b/app/src/main/java/app/fedilab/android/drawers/TagsEditAdapter.java index 2f6c8a554..46bfbddb0 100644 --- a/app/src/main/java/app/fedilab/android/drawers/TagsEditAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/TagsEditAdapter.java @@ -39,7 +39,7 @@ import es.dmoral.toasty.Toasty; * Created by Thomas on 01/12/2018. * Adapter for tags when editing */ -public class TagsEditAdapter extends RecyclerView.Adapter { +public class TagsEditAdapter extends RecyclerView.Adapter { private Context context; private List tags;