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

added record audio button

This commit is contained in:
Daniel Gultsch 2014-05-17 19:21:16 +02:00
parent 27060e303c
commit 736e09fbb5
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/menu/attachment_choices.xml
View File

@ -7,5 +7,7 @@
<item <item
android:id="@+id/attach_take_picture" android:id="@+id/attach_take_picture"
android:title="@string/attach_take_picture"/> android:title="@string/attach_take_picture"/>
<item
android:id="@+id/attach_record_voice"
android:title="@string/attach_record_voice" />
</menu> </menu>

1
res/values-de/strings.xml
View File

@ -163,5 +163,6 @@
<string name="mgmt_account_delete">Löschen</string> <string name="mgmt_account_delete">Löschen</string>
<string name="mgmt_account_disable">Vorübergehend abschalten</string> <string name="mgmt_account_disable">Vorübergehend abschalten</string>
<string name="mgmt_account_enable">Anschalten</string> <string name="mgmt_account_enable">Anschalten</string>
<string name="attach_record_voice">Sprache aufzeichnen</string>
</resources> </resources>

1
res/values/strings.xml
View File

@ -163,5 +163,6 @@
<string name="mgmt_account_delete">Delete</string> <string name="mgmt_account_delete">Delete</string>
<string name="mgmt_account_disable">Temporarily disable</string> <string name="mgmt_account_disable">Temporarily disable</string>
<string name="mgmt_account_enable">Enable</string> <string name="mgmt_account_enable">Enable</string>
<string name="attach_record_voice">Record voice</string>
</resources> </resources>

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

@ -66,11 +66,13 @@ public class ConversationActivity extends XmppActivity {
public static final int REQUEST_DECRYPT_PGP = 0x76783; public static final int REQUEST_DECRYPT_PGP = 0x76783;
private static final int REQUEST_ATTACH_FILE_DIALOG = 0x48502; private static final int REQUEST_ATTACH_FILE_DIALOG = 0x48502;
private static final int REQUEST_IMAGE_CAPTURE = 0x33788; private static final int REQUEST_IMAGE_CAPTURE = 0x33788;
private static final int REQUEST_RECORD_AUDIO = 0x46189;
private static final int REQUEST_SEND_PGP_IMAGE = 0x53883; private static final int REQUEST_SEND_PGP_IMAGE = 0x53883;
public static final int REQUEST_ENCRYPT_MESSAGE = 0x378018; public static final int REQUEST_ENCRYPT_MESSAGE = 0x378018;
private static final int ATTACHMENT_CHOICE_CHOOSE_IMAGE = 0x92734; private static final int ATTACHMENT_CHOICE_CHOOSE_IMAGE = 0x92734;
private static final int ATTACHMENT_CHOICE_TAKE_PHOTO = 0x84123; private static final int ATTACHMENT_CHOICE_TAKE_PHOTO = 0x84123;
private static final int ATTACHMENT_CHOICE_RECORD_VOICE = 0x75291;
protected SlidingPaneLayout spl; protected SlidingPaneLayout spl;
@ -352,6 +354,9 @@ public class ConversationActivity extends XmppActivity {
attachFileIntent.setAction(Intent.ACTION_GET_CONTENT); attachFileIntent.setAction(Intent.ACTION_GET_CONTENT);
Intent chooser = Intent.createChooser(attachFileIntent, getString(R.string.attach_file)); Intent chooser = Intent.createChooser(attachFileIntent, getString(R.string.attach_file));
startActivityForResult(chooser, REQUEST_ATTACH_FILE_DIALOG); startActivityForResult(chooser, REQUEST_ATTACH_FILE_DIALOG);
} else if (attachmentChoice==ATTACHMENT_CHOICE_RECORD_VOICE) {
Intent intent = new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION);
startActivityForResult(intent, REQUEST_RECORD_AUDIO);
} }
} }
} }
@ -452,6 +457,9 @@ public class ConversationActivity extends XmppActivity {
case R.id.attach_take_picture: case R.id.attach_take_picture:
attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO); attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
break; break;
case R.id.attach_record_voice:
attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
break;
} }
return false; return false;
} }