diff --git a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java index 69a226c25..2a8be1c37 100644 --- a/src/org/thoughtcrime/securesms/ConversationUpdateItem.java +++ b/src/org/thoughtcrime/securesms/ConversationUpdateItem.java @@ -67,8 +67,6 @@ public class ConversationUpdateItem extends LinearLayout this.title = findViewById(R.id.conversation_update_title); this.body = findViewById(R.id.conversation_update_body); this.date = findViewById(R.id.conversation_update_date); - - this.setOnClickListener(new InternalClickListener(null)); } @Override @@ -202,58 +200,10 @@ public class ConversationUpdateItem extends LinearLayout Util.runOnMain(() -> bind(messageRecord, locale)); } - @Override - public void setOnClickListener(View.OnClickListener l) { - super.setOnClickListener(new InternalClickListener(l)); - } - @Override public void unbind() { if (sender != null) { sender.removeListener(this); } } - - private class InternalClickListener implements View.OnClickListener { - - @Nullable private final View.OnClickListener parent; - - InternalClickListener(@Nullable View.OnClickListener parent) { - this.parent = parent; - } - - @Override - public void onClick(View v) { - if ((!messageRecord.isIdentityUpdate() && - !messageRecord.isIdentityDefault() && - !messageRecord.isIdentityVerified()) || - !batchSelected.isEmpty()) - { - if (parent != null) parent.onClick(v); - return; - } - - final Recipient sender = ConversationUpdateItem.this.sender; - - IdentityUtil.getRemoteIdentityKey(getContext(), sender).addListener(new ListenableFuture.Listener>() { - @Override - public void onSuccess(Optional result) { - if (result.isPresent()) { - Intent intent = new Intent(getContext(), VerifyIdentityActivity.class); - intent.putExtra(VerifyIdentityActivity.ADDRESS_EXTRA, sender.getAddress()); - intent.putExtra(VerifyIdentityActivity.IDENTITY_EXTRA, new IdentityKeyParcelable(result.get().getIdentityKey())); - intent.putExtra(VerifyIdentityActivity.VERIFIED_EXTRA, result.get().getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED); - - getContext().startActivity(intent); - } - } - - @Override - public void onFailure(ExecutionException e) { - Log.w(TAG, e); - } - }); - } - } - }