aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-01-13 17:50:53 +0100
committerChristian S <christian@pix-art.de>2016-01-13 17:50:53 +0100
commite0c7ed59bb782898a0581abfc2cb5b36b5fdfe4e (patch)
tree9e314da8e36ea937afb43651d25861017e130752 /src/main/java/eu/siacs
parent51a288b26d68aa9b54aefc45c76f54e77744d038 (diff)
parent148ad7250eb488d19b1465f12e1d371e5b010df3 (diff)
Merge remote-tracking branch 'refs/remotes/origin/AvatarPatch' into development
Diffstat (limited to 'src/main/java/eu/siacs')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index edd6cf150..d76d9caea 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -179,7 +179,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
source = Uri.parse("file://"+original);
}
Uri destination = Uri.fromFile(new File(getCacheDir(), "croppedAvatar"));
- final int size = getPixel(192);
+ final int size = getPixel(Config.AVATAR_SIZE);
Crop.of(source, destination).asSquare().withMaxSize(size, size).start(this);
break;
case Crop.REQUEST_CROP: