TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 15:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support cameras that don't return data intent

Browse Source 
Fixes #6926

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-09-06 16:16:01 -07:00
parent bcff186b10
commit 2890490ab4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/CreateProfileActivity.java
View File

@ -119,17 +119,15 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
switch (requestCode) { switch (requestCode) {
case REQUEST_CODE_AVATAR: case REQUEST_CODE_AVATAR:
if (resultCode == Activity.RESULT_OK && data == null) { if (resultCode == Activity.RESULT_OK) {
Toast.makeText(this, R.string.CreateProfileActivity_error_capturing_photo_camera_did_not_return_image, Toast.LENGTH_LONG).show();
} else if (resultCode == Activity.RESULT_OK) {
Uri outputFile = Uri.fromFile(new File(getCacheDir(), "cropped")); Uri outputFile = Uri.fromFile(new File(getCacheDir(), "cropped"));
Uri inputFile = data.getData(); Uri inputFile = (data != null ? data.getData() : null);
if (inputFile == null && captureFile != null) { if (inputFile == null && captureFile != null) {
inputFile = Uri.fromFile(captureFile); inputFile = Uri.fromFile(captureFile);
} }
if (data.getBooleanExtra("delete", false)) { if (data != null && data.getBooleanExtra("delete", false)) {
avatarBytes = null; avatarBytes = null;
avatar.setImageDrawable(ContactPhotoFactory.getResourceContactPhoto(R.drawable.ic_camera_alt_white_24dp) avatar.setImageDrawable(ContactPhotoFactory.getResourceContactPhoto(R.drawable.ic_camera_alt_white_24dp)
.asDrawable(this, getResources().getColor(R.color.grey_400))); .asDrawable(this, getResources().getColor(R.color.grey_400)));