From f251892960376c0548d854e72977e3686af99723 Mon Sep 17 00:00:00 2001 From: stom79 Date: Fri, 27 Oct 2017 13:59:14 +0200 Subject: [PATCH] Adds description to media --- .../gouv/etalab/mastodon/drawers/StatusListAdapter.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index b5bbdc420..299afc3ff 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -42,7 +42,6 @@ import android.text.SpannableString; import android.text.Spanned; import android.text.method.LinkMovementMethod; import android.text.style.ForegroundColorSpan; -import android.util.Log; import android.util.Patterns; import android.util.TypedValue; import android.view.LayoutInflater; @@ -479,7 +478,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct content = status.getReblog().getContent(); displayName = Helper.shortnameToUnicode(status.getReblog().getAccount().getDisplay_name(), true); username = status.getReblog().getAccount().getUsername(); - holder.status_account_displayname.setText(displayName + " " +String.format("@%s",username)); + holder.status_account_displayname.setText(String.format("%s @%s",displayName, username)); ppurl = status.getReblog().getAccount().getAvatar(); holder.status_account_displayname.setVisibility(View.VISIBLE); holder.status_account_displayname.setText(context.getResources().getString(R.string.reblog_by, status.getAccount().getUsername())); @@ -1078,8 +1077,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct //noinspection deprecation content = Html.fromHtml(status.getContent()).toString(); ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, content); - clipboard.setPrimaryClip(clip); - Toast.makeText(context,R.string.clipboard,Toast.LENGTH_LONG).show(); + if( clipboard != null) { + clipboard.setPrimaryClip(clip); + Toast.makeText(context, R.string.clipboard, Toast.LENGTH_LONG).show(); + } return true; case R.id.action_share: Intent sendIntent = new Intent(Intent.ACTION_SEND);