diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 4ddc318ab..8fab4031f 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1113,24 +1113,16 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } } Account account = message.getConversation().getAccount(); - Intent intent; - if (activity.manuallyChangePresence() && !received) { - intent = new Intent(activity, SetPresenceActivity.class); - intent.putExtra(EXTRA_ACCOUNT, account.getJid().toBareJid().toString()); + Intent intent = new Intent(activity, EditAccountActivity.class); + intent.putExtra("jid", account.getJid().toBareJid().toString()); + String fingerprint; + if (message.getEncryption() == Message.ENCRYPTION_PGP + || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { + fingerprint = "pgp"; } else { - intent = new Intent(activity, EditAccountActivity.class); - intent.putExtra("jid", account.getJid().toBareJid().toString()); - String fingerprint; - if (message.getEncryption() == Message.ENCRYPTION_PGP - || message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { - fingerprint = "pgp"; - } else if (message.getEncryption() == Message.ENCRYPTION_OTR) { - fingerprint = "otr"; - } else { - fingerprint = message.getFingerprint(); - } - intent.putExtra("fingerprint", fingerprint); + fingerprint = message.getFingerprint(); } + intent.putExtra("fingerprint", fingerprint); startActivity(intent); }); messageListAdapter.setOnContactPictureLongClicked(message -> { |