TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-20 17:48:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing avatar selection when some gallery apps won't return any extras

Browse Source 
but still succeed // FREEBIE
This commit is contained in:
Jake McGinty
2014-02-18 15:27:18 -08:00
parent 760c96171d
commit e05bacd8c3
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/thoughtcrime/securesms/GroupCreateActivity.java
View File

@@ -238,6 +238,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
File f = new File(Environment.getExternalStorageDirectory(), TEMP_PHOTO_FILE);
try {
f.createNewFile();
f.deleteOnExit();
} catch (IOException e) {
Log.e(TAG, "Error creating new temp file.", e);
Toast.makeText(getApplicationContext(), R.string.GroupCreateActivity_file_io_exception, Toast.LENGTH_SHORT).show();
@@ -338,13 +339,13 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
break;
case PICK_AVATAR:
if(resultCode == RESULT_OK) {
Bundle extras = data.getExtras();
if (extras != null) {
File tempFile = getTempFile();
avatarBmp = BitmapFactory.decodeFile(tempFile.getAbsolutePath());
avatar.setImageBitmap(avatarBmp);
}
File tempFile = getTempFile();
avatarBmp = BitmapFactory.decodeFile(tempFile.getAbsolutePath());
if (avatarBmp != null) avatar.setImageBitmap(avatarBmp);
tempFile.delete();
break;
} else {
Log.i(TAG, "Avatar selection result was not RESULT_OK.");
}
}
}