finished offline otr

2 files changed, 8 insertions, 4 deletions

diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 99556890..06efff4b 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -389,7 +389,7 @@ public class ConversationActivity extends XmppActivity {
 				// TODO Auto-generated method stub
 
 			}
-		}, "file");
+		});
 	}
 
 	private void attachFile(final int attachmentChoice) {
@@ -868,7 +868,7 @@ public class ConversationActivity extends XmppActivity {
 	}
 
 	public void selectPresence(final Conversation conversation,
-			final OnPresenceSelected listener, String reason) {
+			final OnPresenceSelected listener) {
 		Contact contact = conversation.getContact();
 		if (contact == null) {
 			showAddToRosterDialog(conversation);
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 5d7e9f94..1939ae72 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -207,6 +207,9 @@ public class ConversationFragment extends Fragment {
 					}
 				}
 				switch (message.getStatus()) {
+				case Message.STATUS_WAITING:
+					info = getString(R.string.waiting);
+					break;
 				case Message.STATUS_UNSEND:
 					info = getString(R.string.sending);
 					break;
@@ -883,7 +886,7 @@ public class ConversationFragment extends Fragment {
 	}
 
 	protected void sendOtrMessage(final Message message) {
-		ConversationActivity activity = (ConversationActivity) getActivity();
+		final ConversationActivity activity = (ConversationActivity) getActivity();
 		final XmppConnectionService xmppService = activity.xmppConnectionService;
 		if (conversation.hasValidOtrSession()) {
 			activity.xmppConnectionService.sendMessage(message);
@@ -896,6 +899,7 @@ public class ConversationFragment extends Fragment {
 						public void onPresenceSelected(boolean success,
 								String presence) {
 							if (success) {
+								Log.d("xmppService","selected presence "+presence);
 								message.setPresence(presence);
 								xmppService.sendMessage(message);
 								messageSent();
@@ -908,7 +912,7 @@ public class ConversationFragment extends Fragment {
 							xmppService.sendMessage(message);
 							messageSent();
 						}
-					}, "otr");
+					});
 		}
 	}