diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 37 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShareWithActivity.java | 42 |
2 files changed, 19 insertions, 60 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 68764afae..87228a7e7 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -611,12 +611,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void success(Message message) { - activity.xmppConnectionService.sendMessage(message); + } @Override public void error(int errorCode, Message object) { - + //TODO show possible pgp error } @Override @@ -644,7 +644,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke public void success(Message message) { runOnUiThread(() -> activity.hideToast()); hidePrepareFileToast(prepareFileToast); - activity.xmppConnectionService.sendMessage(message); } @Override @@ -661,35 +660,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke }); } - private void attachPhotoToConversation(Conversation conversation, Uri uri) { - if (conversation == null) { - return; - } - final Toast prepareFileToast = Toast.makeText(getActivity(), getText(R.string.preparing_image), Toast.LENGTH_LONG); - prepareFileToast.show(); - activity.delegateUriPermissionsToService(uri); - activity.xmppConnectionService.attachImageToConversation(conversation, uri, - new UiCallback<Message>() { - - @Override - public void userInputRequried(PendingIntent pi, Message object) { - hidePrepareFileToast(prepareFileToast); - } - - @Override - public void success(Message message) { - hidePrepareFileToast(prepareFileToast); - activity.xmppConnectionService.sendMessage(message); - } - - @Override - public void error(final int error, Message message) { - hidePrepareFileToast(prepareFileToast); - runOnUiThread(() -> activity.replaceToast(getString(error))); - } - }); - } - private void attachImagesToConversation(Conversation conversation, Uri uri) { if (conversation == null) { return; @@ -816,7 +786,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void success(Message message) { hidePrepareFileToast(prepareFileToast); - activity.xmppConnectionService.sendMessage(message); } @Override @@ -2522,8 +2491,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void success(Message message) { //TODO the following two call can be made before the callback - message.setEncryption(Message.ENCRYPTION_DECRYPTED); - activity.xmppConnectionService.sendMessage(message); getActivity().runOnUiThread(() -> messageSent()); } diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java index a061bcded..2d72d3a26 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java @@ -72,12 +72,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer @Override public void inform(final String text) { - runOnUiThread(new Runnable() { - @Override - public void run() { - replaceToast(text); - } - }); + runOnUiThread(() -> replaceToast(text)); } @Override @@ -89,24 +84,21 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer @Override public void success(final Message message) { xmppConnectionService.sendMessage(message); - runOnUiThread(new Runnable() { - @Override - public void run() { - if (attachmentCounter.decrementAndGet() <= 0) { - int resId; - if (share.image && share.multiple) { - resId = R.string.shared_images_with_x; - } else if (share.image) { - resId = R.string.shared_image_with_x; - } else { - resId = R.string.shared_file_with_x; - } - replaceToast(getString(resId, message.getConversation().getName())); - if (mReturnToPrevious) { - finish(); - } else { - switchToConversation(message.getConversation()); - } + runOnUiThread(() -> { + if (attachmentCounter.decrementAndGet() <= 0) { + int resId; + if (share.image && share.multiple) { + resId = R.string.shared_images_with_x; + } else if (share.image) { + resId = R.string.shared_image_with_x; + } else { + resId = R.string.shared_file_with_x; + } + replaceToast(getString(resId, message.getConversation().getName())); + if (mReturnToPrevious) { + finish(); + } else { + switchToConversation(message.getConversation()); } } }); @@ -373,7 +365,6 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer if (mReturnToPrevious && this.share.text != null && !this.share.text.isEmpty()) { final PresenceSelector.OnPresenceSelected callback = new PresenceSelector.OnPresenceSelected() { private void finishAndSend(Message message) { - xmppConnectionService.sendMessage(message); replaceToast(getString(R.string.shared_text_with_x, conversation.getName())); finish(); } @@ -415,6 +406,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer if (encryption == Message.ENCRYPTION_OTR) { message.setCounterpart(conversation.getNextCounterpart()); } + xmppConnectionService.sendMessage(message); finishAndSend(message); } }; |