Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable16] reduce adressbook change events and handling #17352

Merged
merged 2 commits into from
Oct 4, 2019
Merged

[stable16] reduce adressbook change events and handling #17352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7ad2c
reduce adressbook change events and handling
blizzz Sep 4, 2019
d932653
adjust test expectations
blizzz Sep 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/user_ldap/lib/User_Proxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public function setDisplayName($uid, $displayName) {
* @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);
}

/**
Expand Down
8 changes: 5 additions & 3 deletions lib/private/Avatar/UserAvatar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function set($data) {

$this->validateAvatar($img);

$this->remove();
$this->remove(true);
$type = $this->getAvatarImageType($img);
$file = $this->folder->newFile('avatar.' . $type);
$file->putContent($data);
Expand Down Expand Up @@ -193,7 +193,7 @@ private function validateAvatar(IImage $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',
Expand All @@ -203,7 +203,9 @@ public function remove() {
$avatar->delete();
}
$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
$this->user->triggerChange('avatar', '');
if(!$silent) {
$this->user->triggerChange('avatar', '');
}
}

/**
Expand Down
3 changes: 1 addition & 2 deletions tests/lib/Avatar/UserAvatarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,7 @@ public function testSetAvatar() {
$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());
}
Expand Down