Fix issue#123

nextcloud · Apr 13, 2020 · d6cbc24 · d6cbc24 · yward · Jun 23, 2020
1 parent 765eeab
commit d6cbc24
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-### Added
+### Fixed
+- [issue#123](https://github.com/nextcloud/user_sql/issues/123) - sync exception - Duplicate entry
 
 ## [4.5.0] - 2020-04-13
 ### Added

diff --git a/lib/Action/EmailSync.php b/lib/Action/EmailSync.php
@@ -99,9 +99,7 @@ public function doAction(User $user)
                 $this->config->setUserValue(
                     $user->uid, "settings", "email", $user->email
                 );
-                \OC::$server->getUserManager()->get($user->uid)->triggerChange(
-                    'eMailAddress', $user->email, null
-                );
+                \OC::$server->getUserManager()->get($user->uid)->setEMailAddress($user->email);
             }
 
             $result = true;
@@ -123,9 +121,7 @@ public function doAction(User $user)
                 $this->config->setUserValue(
                     $user->uid, "settings", "email", $user->email
                 );
-                \OC::$server->getUserManager()->get($user->uid)->triggerChange(
-                    'eMailAddress', $user->email, null
-                );
+                \OC::$server->getUserManager()->get($user->uid)->setEMailAddress($user->email);
             }
 
             $result = true;

diff --git a/lib/Action/NameSync.php b/lib/Action/NameSync.php
@@ -99,9 +99,7 @@ public function doAction(User $user)
                 $this->config->setUserValue(
                     $user->uid, "settings", "displayName", $user->name
                 );
-                \OC::$server->getUserManager()->get($user->uid)->triggerChange(
-                    'displayName', $user->name, null
-                );
+                \OC::$server->getUserManager()->get($user->uid)->setDisplayName($user->name);
             }
 
             $result = true;
@@ -123,9 +121,7 @@ public function doAction(User $user)
                 $this->config->setUserValue(
                     $user->uid, "settings", "displayName", $user->name
                 );
-                \OC::$server->getUserManager()->get($user->uid)->triggerChange(
-                    'displayName', $user->name, null
-                );
+                \OC::$server->getUserManager()->get($user->uid)->setDisplayName($user->name);
             }
 
             $result = true;