From 0d80dcffed74be19dc096e21491d602fe9ea68eb Mon Sep 17 00:00:00 2001 From: tom79 Date: Thu, 31 Oct 2019 13:48:13 +0100 Subject: [PATCH] Fix click issue --- .../android/drawers/StatusListAdapter.java | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) 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 0091ab956..39b1dd1f1 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -3456,29 +3456,26 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_account_profile.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - if (targetedId == null || !targetedId.equals(status.getAccount().getId())) { - Intent intent = new Intent(context, ShowAccountActivity.class); - Bundle b = new Bundle(); - b.putParcelable("account", status.getAccount()); - intent.putExtras(b); - context.startActivity(intent); + if (status.getReblog() != null) { + if (targetedId == null || !targetedId.equals(status.getReblog().getAccount().getId())) { + Intent intent = new Intent(context, ShowAccountActivity.class); + Bundle b = new Bundle(); + b.putParcelable("account", status.getReblog().getAccount()); + intent.putExtras(b); + context.startActivity(intent); + } + } else { + if (targetedId == null || !targetedId.equals(status.getAccount().getId())) { + Intent intent = new Intent(context, ShowAccountActivity.class); + Bundle b = new Bundle(); + b.putParcelable("account", status.getAccount()); + intent.putExtras(b); + context.startActivity(intent); + } } } }); - holder.status_account_profile.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (targetedId == null || !targetedId.equals(status.getReblog().getAccount().getId())) { - Intent intent = new Intent(context, ShowAccountActivity.class); - Bundle b = new Bundle(); - b.putParcelable("account", status.getReblog().getAccount()); - intent.putExtras(b); - context.startActivity(intent); - } - } - }); } else { holder.status_account_profile.setOnClickListener(new View.OnClickListener() { @Override