yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 17:59:39 +02:00
Code Issues Releases Wiki Activity

implement alternative method to get recorded videos

Browse source
This commit is contained in:
B. Petersen 2019-05-11 14:09:26 +02:00
parent a0b7aa4066
commit 9d255bc343
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
2 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -344,7 +344,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Log.w(TAG, "onActivityResult called: " + reqCode + ", " + resultCode + " , " + data);
super.onActivityResult(reqCode, resultCode, data);
if ((data == null && reqCode != TAKE_PHOTO && reqCode != SMS_DEFAULT) ||
if ((data == null && reqCode != TAKE_PHOTO && reqCode != RECORD_VIDEO && reqCode != SMS_DEFAULT) ||
(resultCode != RESULT_OK && reqCode != SMS_DEFAULT))
{
return;
@ -378,15 +378,20 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
supportInvalidateOptionsMenu();
break;
case TAKE_PHOTO:
if (attachmentManager.getCaptureUri() != null) {
setMedia(attachmentManager.getCaptureUri(), MediaType.IMAGE);
if (attachmentManager.getImageCaptureUri() != null) {
setMedia(attachmentManager.getImageCaptureUri(), MediaType.IMAGE);
}
break;
case RECORD_VIDEO:
Uri uri = data.getData();
if(uri!=null) {
Uri uri = null;
if (data!=null) { uri = data.getData(); }
if (uri==null) { uri = attachmentManager.getVideoCaptureUri(); }
if (uri!=null) {
setMedia(uri, MediaType.VIDEO);
}
else {
Toast.makeText(this, "No video returned from system", Toast.LENGTH_LONG).show();
}
break;
case PICK_LOCATION:
/*