diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-12 21:22:44 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-12 21:22:44 +0100 |
| commit | 340272ba841be12dcdf1317e183a45d8b46dce44 (patch) | |
| tree | 4c4cf2121ccfdb1da3ab2825f6ee2de9132531be /src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | |
| parent | 86afdc7aaff4ed6fa37e6d5fd9e5ffab20375f21 (diff) | |
| parent | a95d2d9134508ec694cb48db361f1fd4387d1827 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | 2 |
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 8c10adf2..04868909 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java @@ -195,7 +195,7 @@ public class PublishProfilePictureActivity extends XmppActivity { switch (requestCode) { case REQUEST_CHOOSE_FILE_AND_CROP: Uri source = data.getData(); - String original = FileUtils.getPath(this, source); + String original = FileUtils.getPath(source); if (original != null) { source = Uri.parse("file://"+original); } |