mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17351 from nextcloud/backport/17001/stable17 

[stable17] reduce adressbook change events and handling
This commit is contained in:
Roeland Jago Douma 2019-10-04 11:34:16 +02:00 committed by GitHub
parent 56d61ab9f0 55229d05ff
commit 16ba526982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/lib/User_Proxy.php
View File

@ -253,7 +253,7 @@ class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface,
* @return boolean either the user can or cannot
*/
public function canChangeAvatar($uid) {
return $this->handleRequest($uid, 'canChangeAvatar', array($uid));
return $this->handleRequest($uid, 'canChangeAvatar', [$uid], true);
}
/**

6
lib/private/Avatar/UserAvatar.php
View File

@ -97,7 +97,7 @@ class UserAvatar extends Avatar {
$this->validateAvatar($img);
$this->remove();
$this->remove(true);
$type = $this->getAvatarImageType($img);
$file = $this->folder->newFile('avatar.' . $type);
$file->putContent($data);
@ -193,7 +193,7 @@ class UserAvatar extends Avatar {
* @throws \OCP\Files\NotPermittedException
* @throws \OCP\PreConditionNotMetException
*/
public function remove() {
public function remove(bool $silent = false) {
$avatars = $this->folder->getDirectoryListing();
$this->config->setUserValue($this->user->getUID(), 'avatar', 'version',
@ -203,8 +203,10 @@ class UserAvatar extends Avatar {
$avatar->delete();
}
$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
if(!$silent) {
$this->user->triggerChange('avatar', '');
}
}
/**
* Get the extension of the avatar. If there is no avatar throw Exception

3
tests/lib/Avatar/UserAvatarTest.php
View File

@ -223,8 +223,7 @@ class UserAvatarTest extends \Test\TestCase {
$this->config->expects($this->once())
->method('getUserValue');
// One on remove and once on setting the new avatar
$this->user->expects($this->exactly(2))->method('triggerChange');
$this->user->expects($this->exactly(1))->method('triggerChange');
$this->avatar->set($image->data());
}