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 04d912900..5cf7154c6 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -1341,7 +1341,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct if (isConsoleMode) { - String starting = ""; String acct = status.getAccount().getAcct(); String acctReblog = null; if (!acct.contains("@")) @@ -1569,30 +1568,27 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show(); } }); - holder.fetch_more.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - status.setFetchMore(false); - holder.fetch_more.setEnabled(false); - holder.fetch_more.setVisibility(View.GONE); - if (context instanceof BaseMainActivity) { - SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); - List timelines = new TimelinesDAO(context, db).getDisplayedTimelines(); - for (ManageTimelines tl : timelines) { - if (tl.getType() == ManageTimelines.Type.HOME && mPageReferenceMap != null) { - DisplayStatusFragment homeFragment = (DisplayStatusFragment) mPageReferenceMap.get(tl.getPosition()); - if (homeFragment != null) { - fetch_all_more = true; - homeFragment.fetchMore(status.getId()); - } - break; + holder.fetch_more.setOnLongClickListener(v -> { + status.setFetchMore(false); + holder.fetch_more.setEnabled(false); + holder.fetch_more.setVisibility(View.GONE); + if (context instanceof BaseMainActivity) { + SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open(); + List timelines = new TimelinesDAO(context, db).getDisplayedTimelines(); + for (ManageTimelines tl : timelines) { + if (tl.getType() == ManageTimelines.Type.HOME && mPageReferenceMap != null) { + DisplayStatusFragment homeFragment = (DisplayStatusFragment) mPageReferenceMap.get(tl.getPosition()); + if (homeFragment != null) { + fetch_all_more = true; + homeFragment.fetchMore(status.getId()); } + break; } - } else { - Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show(); } - return false; + } else { + Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show(); } + return false; }); } else { holder.fetch_more.setVisibility(View.GONE); @@ -2158,7 +2154,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct if (!((Activity) context).isFinishing()) Glide.with(holder.status_cardview_image.getContext()) .load(card.getImage()) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners((int) Helper.convertDpToPixel(3, context)))) + .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners((int) Helper.convertDpToPixel(3, context)))) .into(holder.status_cardview_image); } else holder.status_cardview_image.setVisibility(View.GONE); @@ -2181,7 +2177,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } else if (card.getType().toLowerCase().equals("video") && (display_video_preview || (type == RetrieveFeedsAsyncTask.Type.CONTEXT && viewHolder.getAdapterPosition() == conversationPosition))) { Glide.with(holder.status_cardview_image.getContext()) .load(card.getImage()) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10))) .into(holder.webview_preview_card); holder.status_cardview.setVisibility(View.GONE); holder.status_cardview_video.setVisibility(View.VISIBLE); @@ -2490,9 +2486,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct else builderInner.setMessage(Html.fromHtml(status.getContent())); - //Text for report - EditText input = null; + EditText input; if (doAction == API.StatusAction.REPORT) { input = new EditText(context); LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( @@ -2775,7 +2770,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) builderInner.setMessage(Html.fromHtml(status.getContent(), Html.FROM_HTML_MODE_LEGACY)); else - //noinspection deprecation builderInner.setMessage(Html.fromHtml(status.getContent())); break; case R.id.action_copy: @@ -3219,7 +3213,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct .asBitmap() .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10))) .into(new SimpleTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { @@ -3233,7 +3227,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct .asBitmap() .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) - .apply(new RequestOptions().transforms(new BlurTransformation(50, 3), new RoundedCorners(10))) + .apply(new RequestOptions().transform(new BlurTransformation(50, 3), new RoundedCorners(10))) .into(new SimpleTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { @@ -3250,7 +3244,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) .override(640, 480) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10))) .transition(DrawableTransitionOptions.withCrossFade()) .into(imageView); } else { @@ -3258,7 +3252,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) .override(640, 480) - .apply(new RequestOptions().transforms(new BlurTransformation(50, 3), new RoundedCorners(10))) + .apply(new RequestOptions().transform(new BlurTransformation(50, 3), new RoundedCorners(10))) .transition(DrawableTransitionOptions.withCrossFade()) .into(imageView); }