From 06f04e5ec1a938d55c2ee943bb35888f14cc3b5a Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 19 Jun 2016 21:08:49 +0200 Subject: fixed intents for integrated location service and voice recorder --- src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index db150a751..c09b96899 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -633,12 +633,10 @@ public class ConversationActivity extends XmppActivity intent.setAction(Intent.ACTION_GET_CONTENT); break; case ATTACHMENT_CHOICE_RECORD_VOICE: - intent.setAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION); - intent.setPackage("eu.siacs.conversations"); + startActivityForResult(new Intent(getApplicationContext(), RecordingActivity.class),attachmentChoice); break; case ATTACHMENT_CHOICE_LOCATION: - intent.setAction("eu.siacs.conversations.location.request"); - fallbackPackageId = "eu.siacs.conversations.sharelocation"; + startActivityForResult(new Intent(getApplicationContext(), ShareLocationActivity.class),attachmentChoice); break; } if (intent.resolveActivity(getPackageManager()) != null) { -- cgit v1.2.3