sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added presence selection

This commit is contained in:
Daniel Gultsch 2014-05-13 17:42:23 +02:00
parent 888de850cf
commit a1a90a03e0
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -354,11 +354,25 @@ public class ConversationActivity extends XmppActivity {
} }
private void takePicture() { private void takePicture() {
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); selectPresence(getSelectedConversation(), new OnPresenceSelected() {
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, ImageProvider.getIncomingContentUri());
if (takePictureIntent.resolveActivity(getPackageManager()) != null) { @Override
startActivityForResult(takePictureIntent, REQUEST_IMAGE_CAPTURE); public void onPresenceSelected(boolean success, String presence) {
} if (success) {
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, ImageProvider.getIncomingContentUri());
if (takePictureIntent.resolveActivity(getPackageManager()) != null) {
startActivityForResult(takePictureIntent, REQUEST_IMAGE_CAPTURE);
}
}
}
@Override
public void onSendPlainTextInstead() {
// TODO Auto-generated method stub
}
},"file");
} }