aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-06-19 21:08:49 +0200
committerChristian Schneppe <christian@pix-art.de>2016-06-19 21:08:49 +0200
commit06f04e5ec1a938d55c2ee943bb35888f14cc3b5a (patch)
tree7acdb852a6db8195753aa71c100d9baab9bd3c1e /src/main/java
parent15a0c91c3fabc780405f23c5c94233c94b650620 (diff)
fixed intents for integrated location service and voice recorder
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java6
1 files changed, 2 insertions, 4 deletions
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) {