narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

more error handling for avatar publication

Browse source
This commit is contained in:
iNPUTmice 2014-08-16 17:31:53 +02:00
parent 5aa8afdc1c
commit 38f36aa263
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -285,6 +285,9 @@ public class FileBackend {
try { try {
Avatar avatar = new Avatar(); Avatar avatar = new Avatar();
Bitmap bm = cropCenterSquare(image, size); Bitmap bm = cropCenterSquare(image, size);
if (bm==null) {
return null;
}
ByteArrayOutputStream mByteArrayOutputStream = new ByteArrayOutputStream(); ByteArrayOutputStream mByteArrayOutputStream = new ByteArrayOutputStream();
Base64OutputStream mBase64OutputSttream = new Base64OutputStream(mByteArrayOutputStream, Base64.DEFAULT); Base64OutputStream mBase64OutputSttream = new Base64OutputStream(mByteArrayOutputStream, Base64.DEFAULT);
MessageDigest digest = MessageDigest.getInstance("SHA-1"); MessageDigest digest = MessageDigest.getInstance("SHA-1");
@ -355,7 +358,11 @@ public class FileBackend {
InputStream is = context.getContentResolver() InputStream is = context.getContentResolver()
.openInputStream(image); .openInputStream(image);
Bitmap input = BitmapFactory.decodeStream(is, null, options); Bitmap input = BitmapFactory.decodeStream(is, null, options);
if (input==null) {
return null;
} else {
return cropCenterSquare(input, size); return cropCenterSquare(input, size);
}
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
return null; return null;
} }

9
src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
View file

@ -129,6 +129,9 @@ public class PublishProfilePictureActivity extends XmppActivity {
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
if (requestCode == REQUEST_CHOOSE_FILE) { if (requestCode == REQUEST_CHOOSE_FILE) {
this.avatarUri = data.getData(); this.avatarUri = data.getData();
if (xmppConnectionServiceBound) {
loadImageIntoPreview(this.avatarUri);
}
} }
} }
} }
@ -173,6 +176,12 @@ public class PublishProfilePictureActivity extends XmppActivity {
protected void loadImageIntoPreview(Uri uri) { protected void loadImageIntoPreview(Uri uri) {
Bitmap bm = xmppConnectionService.getFileBackend().cropCenterSquare( Bitmap bm = xmppConnectionService.getFileBackend().cropCenterSquare(
uri, 384); uri, 384);
if (bm==null) {
disablePublishButton();
this.hintOrWarning.setTextColor(getWarningTextColor());
this.hintOrWarning.setText(R.string.error_publish_avatar_converting);
return;
}
this.avatar.setImageBitmap(bm); this.avatar.setImageBitmap(bm);
if (support) { if (support) {
enablePublishButton(); enablePublishButton();