narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

clean up in attachment chooser code. fixed #1168

Browse source
This commit is contained in:
Daniel Gultsch 2015-05-04 09:54:10 +02:00
parent e388c75452
commit 61fd5d6696
1 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -398,12 +398,7 @@ public class ConversationActivity extends XmppActivity
} }
private void selectPresenceToAttachFile(final int attachmentChoice, final int encryption) { private void selectPresenceToAttachFile(final int attachmentChoice, final int encryption) {
if (attachmentChoice == ATTACHMENT_CHOICE_LOCATION && encryption != Message.ENCRYPTION_OTR) { final OnPresenceSelected callback = new OnPresenceSelected() {
getSelectedConversation().setNextCounterpart(null);
Intent intent = new Intent("eu.siacs.conversations.location.request");
startActivityForResult(intent,attachmentChoice);
} else {
selectPresence(getSelectedConversation(), new OnPresenceSelected() {
@Override @Override
public void onPresenceSelected() { public void onPresenceSelected() {
@ -452,7 +447,12 @@ public class ConversationActivity extends XmppActivity
startActivity(getInstallApkIntent(fallbackPackageId)); startActivity(getInstallApkIntent(fallbackPackageId));
} }
} }
}); };
if (attachmentChoice == ATTACHMENT_CHOICE_LOCATION && encryption != Message.ENCRYPTION_OTR) {
getSelectedConversation().setNextCounterpart(null);
callback.onPresenceSelected();
} else {
selectPresence(getSelectedConversation(),callback);
} }
} }