From 7e8c68b698b4f00f4ee5aaae15bf2ad1679751f3 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 16 Jun 2014 14:21:22 +0200
Subject: streamlined onpresenceselected listener

---
 src/eu/siacs/conversations/ui/ConversationFragment.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/eu/siacs/conversations/ui/ConversationFragment.java')

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 383cb2fd..91da81e2 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -925,18 +925,8 @@ public class ConversationFragment extends Fragment {
 					new OnPresenceSelected() {
 
 						@Override
-						public void onPresenceSelected(boolean success,
-								String presence) {
-							if (success) {
-								message.setPresence(presence);
-								xmppService.sendMessage(message);
-								messageSent();
-							}
-						}
-
-						@Override
-						public void onSendPlainTextInstead() {
-							message.setEncryption(Message.ENCRYPTION_NONE);
+						public void onPresenceSelected() {
+							message.setPresence(conversation.getNextPresence());
 							xmppService.sendMessage(message);
 							messageSent();
 						}
-- 
cgit v1.2.3