aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-12 23:04:28 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-12 23:04:28 +0200
commit592aded106dfd18e8a239b3b59a26d0a50d64465 (patch)
tree14b883d1d1d4c2880d4fd173eb010d9c2b036b69 /src/eu/siacs/conversations/ui/ConversationFragment.java
parentb1482212b879123344ef8dcdc622ce095a4dc765 (diff)
finished offline otr
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java8
1 files changed, 6 insertions, 2 deletions
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");
+ });
}
}