diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-02-11 22:36:17 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-02-11 22:40:48 +0100 |
commit | 9c87e2269cc1d427fab42047cd8993b6bfb07b6f (patch) | |
tree | cff8d8c37e416b43c8eb84216116883bdf1655fa /src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | |
parent | d38b3c2cf2134738781da626fa7ed49046c9a00f (diff) |
Compilation errors and merge mixups fixed
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java index 9f8ac45c..c70499a9 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java @@ -208,7 +208,7 @@ public class PublishProfilePictureActivity extends XmppActivity { if (this.avatarUri == null) { if (this.account.getAvatar() != null || this.defaultUri == null) { - this.avatar.setImageBitmap(avatarService().get(account, getPixel(192))); + this.avatar.setImageBitmap(AvatarService.getInstance().get(account, getPixel(192))); if (this.defaultUri != null) { this.avatar .setOnLongClickListener(this.backToDefaultListener); @@ -255,10 +255,10 @@ public class PublishProfilePictureActivity extends XmppActivity { options.inJustDecodeBounds = true; BitmapFactory.decodeStream(getContentResolver().openInputStream(uri), null, options); int rotation = ExifHelper.getOrientation(getContentResolver().openInputStream(uri)); - options.inSampleSize = FileBackend.calcSampleSize(options, reqSize); + options.inSampleSize = ImageUtil.calcSampleSize(options, reqSize); options.inJustDecodeBounds = false; Bitmap bm = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri), null, options); - return FileBackend.rotate(bm,rotation); + return ImageUtil.rotate(bm,rotation); } protected void loadImageIntoPreview(Uri uri) { |