aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-141-2/+2
|\
| * hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-131-2/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-091-2/+11
|\|
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-2/+11
* | Merge branch 'siacs/master' into developmentChristian S2016-03-171-5/+1
|\|
| * fixed recursive call instead of call to super in PublishProfileActivityDaniel Gultsch2016-03-131-5/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-22/+40
|\|
| * don't automatically crop avatarDaniel Gultsch2016-03-041-22/+40
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-39/+30
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-38/+29
| * add intent!=null check in onActivityResultin PublishProfilePictureDaniel Gultsch2016-01-201-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-161-0/+7
|\|
| * show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+7
* | Merge remote-tracking branch 'refs/remotes/origin/AvatarPatch' into developmentChristian S2016-01-131-1/+1
|\ \
| * | Update PublishProfilePictureActivity.javaChristian S2016-01-111-1/+1
* | | Merge branch 'siacs/master' into developmentChristian S2016-01-131-5/+25
|\ \ \ | |/ / |/| / | |/
| * check for file storage permission before selecting avatarDaniel Gultsch2016-01-131-5/+25
* | copy commitsChristian S2016-01-041-33/+39
|\|
| * properly rotate avatarsDaniel Gultsch2016-01-041-33/+38
| * fixed avatar loading for non-file urisDaniel Gultsch2015-12-021-9/+5
| * users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-021-6/+33
* | fixed avatar loading for non-file urisDaniel Gultsch2015-12-041-9/+5
* | users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-041-26/+4
* | Merge pull request #51 from philipflohr/masterChristian S2015-11-141-3/+34
|\ \
| * | scale the image to avoid OOM ExecptionsPhilip Flohr2015-11-131-3/+34
* | | Merge pull request #50 from philipflohr/masterChristian S2015-11-081-4/+12
|\| |
| * | don't use the imagepicker provided by android-cropPhilip Flohr2015-11-071-4/+12
* | | copy Avatar Crop patchChristian S2015-11-071-16/+26
|\| |
| * | use Config.AVATAR_SIZE as size for cropping avatar picturePhilip Flohr2015-11-061-1/+1
| * | set the avatar image size to 384x384Philip Flohr2015-11-061-1/+1
| * | users are now able to crop their avatar picturesPhilip Flohr2015-11-061-16/+26
| |/
* | modified avatar size in publish avatar activityChristian S2015-09-041-1/+1
* | resize avatar image in publish profile viewChristian S2015-09-011-1/+1
|/
* added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-1/+8
* rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-0/+4
* call StartConversationActivity in init mode only after adding the first accountDaniel Gultsch2015-05-151-1/+3
* fixed service discovery by properly storing and checking identitiesDaniel Gultsch2015-04-251-2/+1
* init mode (first start) for StartConversationActivity (no up button) and avoi...iNPUTmice2015-02-221-4/+8
* show toast when avatar has been published - fixed #874iNPUTmice2015-01-151-13/+13
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-1/+1
* Update another chunk of stuff to use JID objectsSam Whited2014-11-091-3/+10
* Make conversations the root projectSam Whited2014-10-221-0/+242