more refactoring for presence selection. removed getTo, getFrom and getJid from Element

1 files changed, 9 insertions, 14 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index d2ba6f51..63d740c3 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -825,21 +825,16 @@ public class ConversationFragment extends Fragment {
 	protected void sendOtrMessage(final Message message) {
 		final ConversationActivity activity = (ConversationActivity) getActivity();
 		final XmppConnectionService xmppService = activity.xmppConnectionService;
-		if (conversation.hasValidOtrSession()) {
-			activity.xmppConnectionService.sendMessage(message);
-			messageSent();
-		} else {
-			activity.selectPresence(message.getConversation(),
-					new OnPresenceSelected() {
+		activity.selectPresence(message.getConversation(),
+			new OnPresenceSelected() {
 
-						@Override
-						public void onPresenceSelected() {
-							message.setCounterpart(conversation.getNextCounterpart());
-							xmppService.sendMessage(message);
-							messageSent();
-						}
-					});
-		}
+				@Override
+				public void onPresenceSelected() {
+					message.setCounterpart(conversation.getNextCounterpart());
+					xmppService.sendMessage(message);
+					messageSent();
+				}
+			});
 	}
 
 	public void appendText(String text) {