From 6dde7e1183f0f5210b9d6de1e36ea7e15e58348b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 10 Oct 2018 14:58:58 +0200
Subject: [PATCH 01/24] Improve share select list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/css/sharetabview.scss | 1 +
 core/css/jquery-ui-fixes.scss            | 5 ++++-
 core/js/sharedialogview.js               | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index 14be956222..11747e5c06 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -12,6 +12,7 @@
 		overflow: hidden;
 		line-height: 32px;
 		vertical-align: middle;
+		flex-grow: 1;
 	}
 }
 
diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss
index e30beee44e..729a619737 100644
--- a/core/css/jquery-ui-fixes.scss
+++ b/core/css/jquery-ui-fixes.scss
@@ -171,9 +171,12 @@
 	&.ui-menu {
 		padding: 0;
 		.ui-menu-item a {
+			color: var(--color-text-lighter);
+			padding: 4px 4px 4px 14px;
+
 			&.ui-state-focus, &.ui-state-active {
-				font-weight: inherit;
 				box-shadow: inset 4px 0 var(--color-primary);
+				color: var(--color-text);
 			}
 		}
 	}
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 9c648357e6..c8d9822d25 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -442,19 +442,26 @@
 
 		autocompleteRenderItem: function(ul, item) {
 
+			var icon = 'icon-user';
 			var text = item.label;
 			if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
 				text = t('core', '{sharee} (group)', { sharee: text }, undefined, { escape: false });
+				icon = 'icon-contacts-dark';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
 				text = t('core', '{sharee} (remote)', {sharee: text}, undefined, {escape: false});
+				icon = 'icon-shared';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
 				text = t('core', '{sharee} (remote group)', { sharee: text }, undefined, { escape: false });
+				icon = 'icon-shared';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
 				text = t('core', '{sharee} (email)', { sharee: text }, undefined, { escape: false });
+				icon = 'icon-mail';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
 				text = t('core', '{sharee} ({type}, {owner})', {sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner}, undefined, {escape: false});
+				icon = 'icon-circle';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_ROOM) {
 				text = t('core', '{sharee} (conversation)', { sharee: text }, undefined, { escape: false });
+				icon = 'icon-talk';
 			}
 			var insert = $("<div class='share-autocomplete-item'/>");
 			var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
@@ -468,6 +475,7 @@
 				.text(text)
 				.appendTo(insert);
 			insert.attr('title', item.value.shareWith);
+			insert.append('<span class="icon '+icon+'"></span>');
 			insert = $("<a>")
 				.append(insert);
 			return $("<li>")

From 45d8aeb9f2708cc53473d8a344a1a8fe6a0331bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:16:13 +0200
Subject: [PATCH 02/24] Remove federated sharing address books which are the
 same as local ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/dav/lib/CardDAV/AddressBookImpl.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
index 5034b16ed2..a592b9f088 100644
--- a/apps/dav/lib/CardDAV/AddressBookImpl.php
+++ b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -262,8 +262,12 @@ class AddressBookImpl implements IAddressBook {
 			}
 		}
 
-		if ($this->addressBookInfo['principaluri'] === 'principals/system/system' &&
-			$this->addressBookInfo['uri'] === 'system') {
+		if (
+			$this->addressBookInfo['principaluri'] === 'principals/system/system' && (
+				$this->addressBookInfo['uri'] === 'system' ||
+				$this->addressBookInfo['{DAV:}displayname'] === $this->urlGenerator->getBaseUrl()
+			)
+		) {
 			$result['isLocalSystemBook'] = true;
 		}
 		return $result;

From ce79e587e471493a40f08790f7c9e58f80452198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:20:15 +0200
Subject: [PATCH 03/24] Filter out local users from address book remote
 searches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../Collaboration/Collaborators/RemotePlugin.php    | 13 +++++++++++--
 .../Collaborators/RemotePluginTest.php              |  8 +++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index e0f5298f83..c967b51df1 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -30,6 +30,7 @@ use OCP\Collaboration\Collaborators\SearchResultType;
 use OCP\Contacts\IManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\IConfig;
+use OCP\IUserManager;
 use OCP\Share;
 
 class RemotePlugin implements ISearchPlugin {
@@ -41,11 +42,14 @@ class RemotePlugin implements ISearchPlugin {
 	private $cloudIdManager;
 	/** @var IConfig */
 	private $config;
+	/** @var IUserManager */
+	private $userManager;
 
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config) {
+	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager) {
 		$this->contactsManager = $contactsManager;
 		$this->cloudIdManager = $cloudIdManager;
 		$this->config = $config;
+		$this->userManager = $userManager;
 
 		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
 	}
@@ -69,11 +73,16 @@ class RemotePlugin implements ISearchPlugin {
 				$lowerSearch = strtolower($search);
 				foreach ($cloudIds as $cloudId) {
 					try {
-						list(, $serverUrl) = $this->splitUserRemote($cloudId);
+						list($remoteUser, $serverUrl) = $this->splitUserRemote($cloudId);
 					} catch (\InvalidArgumentException $e) {
 						continue;
 					}
 
+					$localUser = $this->userManager->get($remoteUser);
+					if ($localUser !== null && $cloudId === $localUser->getCloudId()) {
+						continue;
+					}
+
 					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
 						if (strtolower($cloudId) === $lowerSearch) {
 							$searchResult->markExactIdMatch($resultType);
diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
index aa009a7134..ac050e2356 100644
--- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -31,10 +31,15 @@ use OCP\Collaboration\Collaborators\SearchResultType;
 use OCP\Contacts\IManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\IConfig;
+use OCP\IUserManager;
 use OCP\Share;
 use Test\TestCase;
 
 class RemotePluginTest extends TestCase {
+
+	/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $userManager;
+
 	/** @var  IConfig|\PHPUnit_Framework_MockObject_MockObject */
 	protected $config;
 
@@ -53,6 +58,7 @@ class RemotePluginTest extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
+		$this->userManager = $this->createMock(IUserManager::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->contactsManager = $this->createMock(IManager::class);
 		$this->cloudIdManager = new CloudIdManager();
@@ -60,7 +66,7 @@ class RemotePluginTest extends TestCase {
 	}
 
 	public function instantiatePlugin() {
-		$this->plugin = new RemotePlugin($this->contactsManager, $this->cloudIdManager, $this->config);
+		$this->plugin = new RemotePlugin($this->contactsManager, $this->cloudIdManager, $this->config, $this->userManager);
 	}
 
 	/**

From d7caf841df07c1ecb39e72ac4566842b2ee5486a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:21:39 +0200
Subject: [PATCH 04/24] Filter out generic remote result for local users
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../Collaborators/RemotePlugin.php            | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index c967b51df1..405db986d2 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -115,14 +115,24 @@ class RemotePlugin implements ISearchPlugin {
 			$result['wide'] = array_slice($result['wide'], $offset, $limit);
 		}
 
+		/**
+		 * Add generic share with remote item for valid cloud ids that are not users of the local instance
+		 */
 		if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			$result['exact'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
-			];
+			try {
+				list($remoteUser, $serverUrl) = $this->splitUserRemote($search);
+				$localUser = $this->userManager->get($remoteUser);
+				if ($localUser === null || $search !== $localUser->getCloudId()) {
+					$result['exact'][] = [
+						'label' => $search,
+						'value' => [
+							'shareType' => Share::SHARE_TYPE_REMOTE,
+							'shareWith' => $search,
+						],
+					];
+				}
+			} catch (\InvalidArgumentException $e) {
+			}
 		}
 
 		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);

From e5cae301ebeb472d8c635b479fb5971530122f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:56:41 +0200
Subject: [PATCH 05/24] Highlight search term in sharing results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/css/jquery-ui-fixes.scss | 1 +
 core/js/sharedialogview.js    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss
index 729a619737..d80d0c61e4 100644
--- a/core/css/jquery-ui-fixes.scss
+++ b/core/css/jquery-ui-fixes.scss
@@ -71,6 +71,7 @@
 	border: 1px solid var(--color-main-background);
 	background: var(--color-main-background) none;
 	color: var(--color-text-lighter);
+	font-weight: 600;
 }
 .ui-state-highlight a,
 .ui-widget-content .ui-state-highlight a,
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index c8d9822d25..7b8759527b 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -472,7 +472,11 @@
 			}
 
 			$("<div class='autocomplete-item-text'></div>")
-				.text(text)
+				.html(
+					text.replace(
+					new RegExp(this.term, "gi"),
+					"<span class='ui-state-highlight'>$&</span>")
+				)
 				.appendTo(insert);
 			insert.attr('title', item.value.shareWith);
 			insert.append('<span class="icon '+icon+'"></span>');

From a1c6e44700d255654838836f4bf5dd00272605bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:57:22 +0200
Subject: [PATCH 06/24] Add collaborators uuid to properly render the avatar
 and for later grouping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js                               | 5 ++++-
 lib/private/Collaboration/Collaborators/MailPlugin.php   | 5 +++++
 lib/private/Collaboration/Collaborators/RemotePlugin.php | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 7b8759527b..baf70fa63a 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -468,7 +468,10 @@
 			if (item.value.shareType === OC.Share.SHARE_TYPE_USER || item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
 				avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
 			} else {
-				avatar.imageplaceholder(text, undefined, 32);
+				if (typeof item.uuid === 'undefined') {
+					item.uuid = text;
+				}
+				avatar.imageplaceholder(item.uuid, text, 32);
 			}
 
 			$("<div class='autocomplete-item-text'></div>")
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
index 101d6845ec..9abbc0f3af 100644
--- a/lib/private/Collaboration/Collaborators/MailPlugin.php
+++ b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -121,6 +121,7 @@ class MailPlugin implements ISearchPlugin {
 							if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
 								$singleResult = [[
 									'label' => $displayName,
+									'uuid' => $contact['UID'],
 									'value' => [
 										'shareType' => Share::SHARE_TYPE_USER,
 										'shareWith' => $cloud->getUser(),
@@ -142,6 +143,7 @@ class MailPlugin implements ISearchPlugin {
 							if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
 								$userResults['wide'][] = [
 									'label' => $displayName,
+									'uuid' => $contact['UID'],
 									'value' => [
 										'shareType' => Share::SHARE_TYPE_USER,
 										'shareWith' => $cloud->getUser(),
@@ -160,6 +162,7 @@ class MailPlugin implements ISearchPlugin {
 						}
 						$result['exact'][] = [
 							'label' => $displayName,
+							'uuid' => $contact['UID'],
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -168,6 +171,7 @@ class MailPlugin implements ISearchPlugin {
 					} else {
 						$result['wide'][] = [
 							'label' => $displayName,
+							'uuid' => $contact['UID'],
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -194,6 +198,7 @@ class MailPlugin implements ISearchPlugin {
 		if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {
 			$result['exact'][] = [
 				'label' => $search,
+				'uuid' => $search,
 				'value' => [
 					'shareType' => Share::SHARE_TYPE_EMAIL,
 					'shareWith' => $search,
diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index 405db986d2..af28c97c10 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -89,6 +89,7 @@ class RemotePlugin implements ISearchPlugin {
 						}
 						$result['exact'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
+							'uuid' => $contact['UID'],
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -98,6 +99,7 @@ class RemotePlugin implements ISearchPlugin {
 					} else {
 						$result['wide'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
+							'uuid' => $contact['UID'],
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,

From 06d8438fdab04371532d5bbf7f482bf3fca7c526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:57:47 +0200
Subject: [PATCH 07/24] Group share suggestions by userid
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index baf70fa63a..2c31a96324 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -312,6 +312,12 @@
 
 						var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(rooms).concat(lookup);
 
+						function dynamicSort(property) {
+							return function (a,b) {
+								return (a[property] < b[property]) ? -1 : (a[property] > b[property]) ? 1 : 0;
+							}
+						}
+						var grouped = suggestions.sort(dynamicSort('uuid'));
 						var moreResultsAvailable =
 							(
 								oc_config['sharing.maxAutocompleteResults'] > 0
@@ -328,7 +334,7 @@
 									)
 							);
 
-						deferred.resolve(suggestions, exactMatches, moreResultsAvailable);
+						deferred.resolve(grouped, exactMatches, moreResultsAvailable);
 					} else {
 						deferred.reject(result.ocs.meta.message);
 					}

From 8b92a6c9cb0e4dea84aa0bfac75ad05c358d0b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 18 Oct 2018 12:31:57 +0200
Subject: [PATCH 08/24] Add type of properties to address book results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/dav/lib/CardDAV/AddressBookImpl.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
index a592b9f088..e9946e65ab 100644
--- a/apps/dav/lib/CardDAV/AddressBookImpl.php
+++ b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -255,7 +255,13 @@ class AddressBookImpl implements IAddressBook {
 					$result[$property->name] = [];
 				}
 
-				$result[$property->name][] = $property->getValue();
+				$type = $this->getTypeFromProperty($property);
+				if ($type !== null) {
+					$result[$property->name][$type] = $property->getValue();
+				} else {
+					$result[$property->name][] = $property->getValue();
+				}
+
 
 			} else {
 				$result[$property->name] = $property->getValue();

From 870e01518d1d0741b4f51eebaf5be186fd43cbf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 18 Oct 2018 12:33:23 +0200
Subject: [PATCH 09/24] Add type to Remote and Mail plugins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/private/Collaboration/Collaborators/MailPlugin.php   | 4 +++-
 lib/private/Collaboration/Collaborators/RemotePlugin.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
index 9abbc0f3af..e89e22d012 100644
--- a/lib/private/Collaboration/Collaborators/MailPlugin.php
+++ b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -87,7 +87,7 @@ class MailPlugin implements ISearchPlugin {
 				if (!is_array($emailAddresses)) {
 					$emailAddresses = [$emailAddresses];
 				}
-				foreach ($emailAddresses as $emailAddress) {
+				foreach ($emailAddresses as $type => $emailAddress) {
 					$displayName = $emailAddress;
 					if (isset($contact['FN'])) 	{
 						$displayName = $contact['FN'] . ' (' . $emailAddress . ')';
@@ -163,6 +163,7 @@ class MailPlugin implements ISearchPlugin {
 						$result['exact'][] = [
 							'label' => $displayName,
 							'uuid' => $contact['UID'],
+							'type' => $type,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -172,6 +173,7 @@ class MailPlugin implements ISearchPlugin {
 						$result['wide'][] = [
 							'label' => $displayName,
 							'uuid' => $contact['UID'],
+							'type' => $type,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index af28c97c10..bde6d15b7b 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -71,7 +71,7 @@ class RemotePlugin implements ISearchPlugin {
 					$cloudIds = [$cloudIds];
 				}
 				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
+				foreach ($cloudIds as $type => $cloudId) {
 					try {
 						list($remoteUser, $serverUrl) = $this->splitUserRemote($cloudId);
 					} catch (\InvalidArgumentException $e) {
@@ -90,6 +90,7 @@ class RemotePlugin implements ISearchPlugin {
 						$result['exact'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
 							'uuid' => $contact['UID'],
+							'type' => $type,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -100,6 +101,7 @@ class RemotePlugin implements ISearchPlugin {
 						$result['wide'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
 							'uuid' => $contact['UID'],
+							'type' => $type,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,

From 3e11515b9c4ab9f8cb9c3f48082d6d086801c0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 18 Oct 2018 12:36:37 +0200
Subject: [PATCH 10/24] Merge contacts and add type of result to the UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/css/sharetabview.scss | 19 +++++++
 core/js/sharedialogview.js               | 64 ++++++++++++++++++++----
 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index 11747e5c06..c3c55c10ba 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -4,6 +4,10 @@
 
 .share-autocomplete-item {
 	display: flex;
+
+	&.merged {
+		margin-left: 32px;
+	}
 	.autocomplete-item-text {
 		margin-left: 10px;
 		margin-right: 10px;
@@ -13,6 +17,21 @@
 		line-height: 32px;
 		vertical-align: middle;
 		flex-grow: 1;
+		.ui-state-highlight {
+			border: none;
+			margin: 0;
+		}
+	}
+	&.with-description {
+		.autocomplete-item-text {
+			line-height: 100%;
+		}
+	}
+	.autocomplete-item-details {
+		display: block;
+		line-height: 130%;
+		font-size: 90%;
+		opacity: 0.7;
 	}
 }
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 2c31a96324..8c9e812adf 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -314,10 +314,29 @@
 
 						function dynamicSort(property) {
 							return function (a,b) {
-								return (a[property] < b[property]) ? -1 : (a[property] > b[property]) ? 1 : 0;
+								var aProperty = '';
+								var bProperty = '';
+								if (typeof a[property] !== 'undefined') {
+									aProperty = a[property];
+								}
+								if (typeof b[property] !== 'undefined') {
+									bProperty = b[property];
+								}
+								return (aProperty < bProperty) ? -1 : (aProperty > bProperty) ? 1 : 0;
 							}
 						}
 						var grouped = suggestions.sort(dynamicSort('uuid'));
+						console.log(grouped);
+						var previousUuid = null;
+						groupedLength = grouped.length;
+						for (i = 0; i < groupedLength; i++) {
+							if (typeof grouped[i].uuid !== 'undefined' && grouped[i].uuid === previousUuid) {
+								grouped[i].merged = true;
+							} else {
+								grouped[i].merged = false;
+							}
+							previousUuid = grouped[i].uuid;
+						}
 						var moreResultsAvailable =
 							(
 								oc_config['sharing.maxAutocompleteResults'] > 0
@@ -469,15 +488,39 @@
 				text = t('core', '{sharee} (conversation)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-talk';
 			}
-			var insert = $("<div class='share-autocomplete-item'/>");
-			var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
-			if (item.value.shareType === OC.Share.SHARE_TYPE_USER || item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
-				avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
-			} else {
-				if (typeof item.uuid === 'undefined') {
-					item.uuid = text;
+			var description = '';
+			var getTranslatedType = function(type) {
+				switch (type) {
+					case 'HOME':
+						return t('core', 'Home');
+					case 'WORK':
+						return t('core', 'Home');
+					case 'OTHER':
+						return t('core', 'Other');
+					default:
+						return type;
+				}
+			};
+			if (typeof item.type !== 'undefined') {
+				description = getTranslatedType(item.type);
+			}
+			var insert = $("<div class='share-autocomplete-item'/>");
+			if (description !== '') {
+				insert.addClass('with-description');
+			}
+			if (item.merged) {
+				insert.addClass('merged');
+				text = item.value.shareWith;
+			} else {
+				var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
+				if (item.value.shareType === OC.Share.SHARE_TYPE_USER || item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
+					avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
+				} else {
+					if (typeof item.uuid === 'undefined') {
+						item.uuid = text;
+					}
+					avatar.imageplaceholder(item.uuid, text, 32);
 				}
-				avatar.imageplaceholder(item.uuid, text, 32);
 			}
 
 			$("<div class='autocomplete-item-text'></div>")
@@ -485,10 +528,11 @@
 					text.replace(
 					new RegExp(this.term, "gi"),
 					"<span class='ui-state-highlight'>$&</span>")
+					+ '<span class="autocomplete-item-details">' + description + '</span>'
 				)
 				.appendTo(insert);
 			insert.attr('title', item.value.shareWith);
-			insert.append('<span class="icon '+icon+'"></span>');
+			insert.append('<span class="icon '+icon+'" title="' + text + '"></span>');
 			insert = $("<a>")
 				.append(insert);
 			return $("<li>")

From 5059605c99cad4b97da2ced87cb4f3babdfe63ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 18 Oct 2018 12:37:26 +0200
Subject: [PATCH 11/24] Increase max-width of the share autocompletion
 suggestions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/css/sharetabview.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index c3c55c10ba..246e1d48c3 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -224,8 +224,8 @@
 }
 
 .ui-autocomplete {
-	/* limit dropdown height to 4 1/2 entries */
-	max-height: calc(36px * 4.5);;
+	/* limit dropdown height to 7 entries */
+	max-height: calc(36px * 7);
 	overflow-y: auto;
 	overflow-x: hidden;
 	z-index: 1550 !important;

From fd08dd613a620c16c14a9492d11827cc1bd75034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 18 Oct 2018 12:37:54 +0200
Subject: [PATCH 12/24] Add talk icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/css/icons.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/css/icons.scss b/core/css/icons.scss
index 5b96d1223a..99b1dc9c21 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -466,3 +466,7 @@ img, object, video, button, textarea, input, select, div[contenteditable='true']
 	@include icon-color('search', 'actions', $color-black, 1, true);
 }
 
+
+.icon-talk {
+	@include icon-color('app-dark', 'spreed', $color-black, 1);
+}

From 3313c0142df1399a038371c5265fa4b3d126b201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 18 Oct 2018 12:38:22 +0200
Subject: [PATCH 13/24] Simplify share list text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 8c9e812adf..9709c734f6 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -466,26 +466,21 @@
 		},
 
 		autocompleteRenderItem: function(ul, item) {
-
 			var icon = 'icon-user';
 			var text = item.label;
 			if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
-				text = t('core', '{sharee} (group)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-contacts-dark';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
-				text = t('core', '{sharee} (remote)', {sharee: text}, undefined, {escape: false});
 				icon = 'icon-shared';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
 				text = t('core', '{sharee} (remote group)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-shared';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
-				text = t('core', '{sharee} (email)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-mail';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
 				text = t('core', '{sharee} ({type}, {owner})', {sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner}, undefined, {escape: false});
 				icon = 'icon-circle';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_ROOM) {
-				text = t('core', '{sharee} (conversation)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-talk';
 			}
 			var description = '';

From 192324e4decc850d5def1394581a0dce2f2402d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 23 Oct 2018 09:21:33 +0200
Subject: [PATCH 14/24] Make dropdown height 6 1/2 entries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/css/sharetabview.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index 246e1d48c3..526a5d3937 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -224,8 +224,8 @@
 }
 
 .ui-autocomplete {
-	/* limit dropdown height to 7 entries */
-	max-height: calc(36px * 7);
+	/* limit dropdown height to 6 1/2 entries */
+	max-height: calc(36px * 6.5);
 	overflow-y: auto;
 	overflow-x: hidden;
 	z-index: 1550 !important;

From 61af60752555bb0c7f0a30cb7b7f35e7ca45fa45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 29 Oct 2018 17:00:09 +0100
Subject: [PATCH 15/24] Make enhancing entries with type property optional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/dav/lib/CardDAV/AddressBookImpl.php      | 13 ++++---
 .../Collaborators/MailPlugin.php              | 11 ++++--
 .../Collaborators/RemotePlugin.php            | 19 +++++++---
 lib/public/IAddressBook.php                   | 14 ++++----
 .../Collaborators/RemotePluginTest.php        | 36 +++++++++++++++----
 5 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
index e9946e65ab..4f2491e189 100644
--- a/apps/dav/lib/CardDAV/AddressBookImpl.php
+++ b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -95,9 +95,11 @@ class AddressBookImpl implements IAddressBook {
 	public function search($pattern, $searchProperties, $options) {
 		$results = $this->backend->search($this->getKey(), $pattern, $searchProperties);
 
+		$withTypes = \array_key_exists('types', $options) && $options['types'] === true;
+
 		$vCards = [];
 		foreach ($results as $result) {
-			$vCards[] = $this->vCard2Array($result['uri'], $this->readCard($result['carddata']));
+			$vCards[] = $this->vCard2Array($result['uri'], $this->readCard($result['carddata']), $withTypes);
 		}
 
 		return $vCards;
@@ -220,7 +222,7 @@ class AddressBookImpl implements IAddressBook {
 	 * @param VCard $vCard
 	 * @return array
 	 */
-	protected function vCard2Array($uri, VCard $vCard) {
+	protected function vCard2Array($uri, VCard $vCard, $withTypes = false) {
 		$result = [
 			'URI' => $uri,
 		];
@@ -256,8 +258,11 @@ class AddressBookImpl implements IAddressBook {
 				}
 
 				$type = $this->getTypeFromProperty($property);
-				if ($type !== null) {
-					$result[$property->name][$type] = $property->getValue();
+				if ($withTypes) {
+					$result[$property->name][] = [
+						'type' => $type,
+						'value' => $property->getValue()
+						];
 				} else {
 					$result[$property->name][] = $property->getValue();
 				}
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
index e89e22d012..1d0738677b 100644
--- a/lib/private/Collaboration/Collaborators/MailPlugin.php
+++ b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -84,11 +84,16 @@ class MailPlugin implements ISearchPlugin {
 		foreach ($addressBookContacts as $contact) {
 			if (isset($contact['EMAIL'])) {
 				$emailAddresses = $contact['EMAIL'];
-				if (!is_array($emailAddresses)) {
+				if (\is_string($emailAddresses)) {
 					$emailAddresses = [$emailAddresses];
 				}
 				foreach ($emailAddresses as $type => $emailAddress) {
 					$displayName = $emailAddress;
+					if (\is_array($emailAddress)) {
+						$emailAddressData = $emailAddress;
+						$emailAddress = $emailAddressData['value'];
+						$emailAddressType = $emailAddressData['type'];
+					}
 					if (isset($contact['FN'])) 	{
 						$displayName = $contact['FN'] . ' (' . $emailAddress . ')';
 					}
@@ -163,7 +168,7 @@ class MailPlugin implements ISearchPlugin {
 						$result['exact'][] = [
 							'label' => $displayName,
 							'uuid' => $contact['UID'],
-							'type' => $type,
+							'type' => $emailAddressType,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -173,7 +178,7 @@ class MailPlugin implements ISearchPlugin {
 						$result['wide'][] = [
 							'label' => $displayName,
 							'uuid' => $contact['UID'],
-							'type' => $type,
+							'type' => $emailAddressType,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index bde6d15b7b..3da6bdeb63 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -44,12 +44,15 @@ class RemotePlugin implements ISearchPlugin {
 	private $config;
 	/** @var IUserManager */
 	private $userManager;
+	/** @var string */
+	private $userId;
 
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager) {
+	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager, $userId) {
 		$this->contactsManager = $contactsManager;
 		$this->cloudIdManager = $cloudIdManager;
 		$this->config = $config;
 		$this->userManager = $userManager;
+		$this->userId = $userId;
 
 		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
 	}
@@ -67,11 +70,17 @@ class RemotePlugin implements ISearchPlugin {
 			}
 			if (isset($contact['CLOUD'])) {
 				$cloudIds = $contact['CLOUD'];
-				if (!is_array($cloudIds)) {
+				if (is_string($cloudIds)) {
 					$cloudIds = [$cloudIds];
 				}
 				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $type => $cloudId) {
+				foreach ($cloudIds as $cloudId) {
+					$cloudIdType = '';
+					if (\is_array($cloudId)) {
+						$cloudIdData = $cloudId;
+						$cloudId = $cloudIdData['value'];
+						$cloudIdType = $cloudIdData['type'];
+					}
 					try {
 						list($remoteUser, $serverUrl) = $this->splitUserRemote($cloudId);
 					} catch (\InvalidArgumentException $e) {
@@ -90,7 +99,7 @@ class RemotePlugin implements ISearchPlugin {
 						$result['exact'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
 							'uuid' => $contact['UID'],
-							'type' => $type,
+							'type' => $cloudIdType,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -101,7 +110,7 @@ class RemotePlugin implements ISearchPlugin {
 						$result['wide'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
 							'uuid' => $contact['UID'],
-							'type' => $type,
+							'type' => $cloudIdType,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
diff --git a/lib/public/IAddressBook.php b/lib/public/IAddressBook.php
index 67c34c9e8c..4739e6f0c5 100644
--- a/lib/public/IAddressBook.php
+++ b/lib/public/IAddressBook.php
@@ -55,16 +55,18 @@ namespace OCP {
 		/**
 		 * @param string $pattern which should match within the $searchProperties
 		 * @param array $searchProperties defines the properties within the query pattern should match
-		 * @param array $options - for future use. One should always have options!
+		 * @param array $options Options to define the output format
+		 * 	- types boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
+		 *    example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']]
 		 * @return array an array of contacts which are arrays of key-value-pairs
+		 *  example result:
+		 *  [
+		 *		['id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'],
+		 *		['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['d@e.f', 'g@h.i']]
+		 *	]
 		 * @since 5.0.0
 		 */
 		public function search($pattern, $searchProperties, $options);
-		//	// dummy results
-		//	return array(
-		//		array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
-		//		array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
-		//	);
 
 		/**
 		 * @param array $properties this array if key-value-pairs defines a contact
diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
index ac050e2356..e253f2dfc9 100644
--- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -66,7 +66,7 @@ class RemotePluginTest extends TestCase {
 	}
 
 	public function instantiatePlugin() {
-		$this->plugin = new RemotePlugin($this->contactsManager, $this->cloudIdManager, $this->config, $this->userManager);
+		$this->plugin = new RemotePlugin($this->contactsManager, $this->cloudIdManager, $this->config, $this->userManager, 'admin');
 	}
 
 	/**
@@ -158,14 +158,17 @@ class RemotePluginTest extends TestCase {
 				'test',
 				[
 					[
+						'UID' => 'uid',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid',
 						'FN' => 'User2 @ Localhost',
 						'CLOUD' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'CLOUD' => [
 							'username@localhost',
@@ -173,7 +176,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				true,
-				['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => ['remotes' => []]],
+				['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => ['remotes' => []]],
 				false,
 				true,
 			],
@@ -181,14 +184,17 @@ class RemotePluginTest extends TestCase {
 				'test',
 				[
 					[
+						'UID' => 'uid',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid',
 						'FN' => 'User2 @ Localhost',
 						'CLOUD' => [
 						],
 					],
 					[
+						'UID' => 'uid',
 						'FN' => 'User @ Localhost',
 						'CLOUD' => [
 							'username@localhost',
@@ -204,14 +210,17 @@ class RemotePluginTest extends TestCase {
 				'test@remote',
 				[
 					[
+						'UID' => 'uid',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid',
 						'FN' => 'User2 @ Localhost',
 						'CLOUD' => [
 						],
 					],
 					[
+						'UID' => 'uid',
 						'FN' => 'User @ Localhost',
 						'CLOUD' => [
 							'username@localhost',
@@ -219,7 +228,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				true,
-				['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => ['remotes' => [['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']]]]],
+				['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => ['remotes' => [['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']]]]],
 				false,
 				true,
 			],
@@ -227,14 +236,17 @@ class RemotePluginTest extends TestCase {
 				'test@remote',
 				[
 					[
+						'UID' => 'uid',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid',
 						'FN' => 'User2 @ Localhost',
 						'CLOUD' => [
 						],
 					],
 					[
+						'UID' => 'uid',
 						'FN' => 'User @ Localhost',
 						'CLOUD' => [
 							'username@localhost',
@@ -250,14 +262,17 @@ class RemotePluginTest extends TestCase {
 				'username@localhost',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => '2',
 						'FN' => 'User2 @ Localhost',
 						'CLOUD' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'CLOUD' => [
 							'username@localhost',
@@ -265,7 +280,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				true,
-				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]]]],
+				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]]]],
 				true,
 				true,
 			],
@@ -273,14 +288,17 @@ class RemotePluginTest extends TestCase {
 				'username@localhost',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'CLOUD' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'CLOUD' => [
 							'username@localhost',
@@ -288,7 +306,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				false,
-				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]]]],
+				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]]]],
 				true,
 				true,
 			],
@@ -297,14 +315,17 @@ class RemotePluginTest extends TestCase {
 				'user name@localhost',
 				[
 					[
+						'UID' => 'uid1',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'CLOUD' => [
 						],
 					],
 					[
+						'UID' => 'uid3',
 						'FN' => 'User Name @ Localhost',
 						'CLOUD' => [
 							'user name@localhost',
@@ -312,7 +333,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				false,
-				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User Name @ Localhost (user name@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'user name@localhost', 'server' => 'localhost']]]]],
+				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User Name @ Localhost (user name@localhost)', 'uuid' => 'uid3', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'user name@localhost', 'server' => 'localhost']]]]],
 				true,
 				true,
 			],
@@ -321,14 +342,17 @@ class RemotePluginTest extends TestCase {
 				'user space@remote',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'CLOUD' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'CLOUD' => [
 							'username@localhost',

From 7a65779316b275dedf689f14ce5228b64ec6cb5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 23 Oct 2018 09:24:04 +0200
Subject: [PATCH 16/24] Add local share if remote cloud id matches a local user
 ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../Collaboration/Collaborators/RemotePlugin.php   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index 3da6bdeb63..abe9912551 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -88,8 +88,18 @@ class RemotePlugin implements ISearchPlugin {
 					}
 
 					$localUser = $this->userManager->get($remoteUser);
-					if ($localUser !== null && $cloudId === $localUser->getCloudId()) {
-						continue;
+					/**
+					 * Add local share if remote cloud id matches a local user ones
+					 */
+					if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId() ) {
+						$result['wide'][] = [
+							'label' => $contact['FN'],
+							'uuid' => $contact['UID'],
+							'value' => [
+								'shareType' => Share::SHARE_TYPE_USER,
+								'shareWith' => $remoteUser
+							]
+						];
 					}
 
 					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {

From e8e898ede8b7655f9c4e61834d2a038b009bc6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 25 Oct 2018 21:36:44 +0200
Subject: [PATCH 17/24] Use tab to complete selected entry to the share entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 9709c734f6..cd7f07011c 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -539,6 +539,16 @@
 		_onSelectRecipient: function(e, s) {
 			var self = this;
 
+			if (e.keyCode == 9) {
+				e.preventDefault();
+				e.target.value = s.item.label;
+				setTimeout(function() {
+					$(e.target).attr('disabled', false)
+						.autocomplete('search', $(e.target).val());
+				}, 0);
+				return false;
+			}
+
 			e.preventDefault();
 			// Ensure that the keydown handler for the input field is not
 			// called; otherwise it would try to add the recipient again, which

From f116461d4b435b28cd62c3c121a33108e8812e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 26 Oct 2018 13:46:24 +0200
Subject: [PATCH 18/24] Show one share method per contact for inaccurate
 results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index cd7f07011c..c255152e66 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -325,16 +325,30 @@
 								return (aProperty < bProperty) ? -1 : (aProperty > bProperty) ? 1 : 0;
 							}
 						}
+
+						/**
+						 * Sort share entries by uuid to properly group them
+						 */
 						var grouped = suggestions.sort(dynamicSort('uuid'));
-						console.log(grouped);
+
 						var previousUuid = null;
-						groupedLength = grouped.length;
+						var groupedLength = grouped.length;
+						var result = [];
+						/**
+						 * build the result array that only contains all contact entries from
+						 * merged contacts, if the search term matches its contact name
+						 */
 						for (i = 0; i < groupedLength; i++) {
+							console.log(grouped[i]);
 							if (typeof grouped[i].uuid !== 'undefined' && grouped[i].uuid === previousUuid) {
 								grouped[i].merged = true;
 							} else {
 								grouped[i].merged = false;
 							}
+							if (searchTerm === grouped[i].name || grouped[i].merged === false) {
+								result.push(grouped[i]);
+							} else {
+							}
 							previousUuid = grouped[i].uuid;
 						}
 						var moreResultsAvailable =
@@ -353,7 +367,7 @@
 									)
 							);
 
-						deferred.resolve(grouped, exactMatches, moreResultsAvailable);
+						deferred.resolve(result, exactMatches, moreResultsAvailable);
 					} else {
 						deferred.reject(result.ocs.meta.message);
 					}
@@ -468,6 +482,9 @@
 		autocompleteRenderItem: function(ul, item) {
 			var icon = 'icon-user';
 			var text = item.label;
+			if (typeof item.name !== 'undefined') {
+				text = item.name;
+			}
 			if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
 				icon = 'icon-contacts-dark';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
@@ -496,13 +513,10 @@
 						return type;
 				}
 			};
-			if (typeof item.type !== 'undefined') {
+			if (typeof item.type !== 'undefined' && item.type !== null) {
 				description = getTranslatedType(item.type);
 			}
 			var insert = $("<div class='share-autocomplete-item'/>");
-			if (description !== '') {
-				insert.addClass('with-description');
-			}
 			if (item.merged) {
 				insert.addClass('merged');
 				text = item.value.shareWith;
@@ -516,6 +530,10 @@
 					}
 					avatar.imageplaceholder(item.uuid, text, 32);
 				}
+				description = item.value.shareWith;
+			}
+			if (description !== '') {
+				insert.addClass('with-description');
 			}
 
 			$("<div class='autocomplete-item-text'></div>")
@@ -541,7 +559,11 @@
 
 			if (e.keyCode == 9) {
 				e.preventDefault();
-				e.target.value = s.item.label;
+				if (typeof s.item.name !== 'undefined') {
+					e.target.value = s.item.name;
+				} else {
+					e.target.value = s.item.label;
+				}
 				setTimeout(function() {
 					$(e.target).attr('disabled', false)
 						.autocomplete('search', $(e.target).val());

From cb463d73d5b4955935d4a0c0f4782d1a23472e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 26 Oct 2018 13:46:47 +0200
Subject: [PATCH 19/24] Add name field to mail and remote results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/private/Collaboration/Collaborators/MailPlugin.php   | 4 ++++
 lib/private/Collaboration/Collaborators/RemotePlugin.php | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
index 1d0738677b..1ac681c894 100644
--- a/lib/private/Collaboration/Collaborators/MailPlugin.php
+++ b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -127,6 +127,7 @@ class MailPlugin implements ISearchPlugin {
 								$singleResult = [[
 									'label' => $displayName,
 									'uuid' => $contact['UID'],
+									'name' => $contact['FN'],
 									'value' => [
 										'shareType' => Share::SHARE_TYPE_USER,
 										'shareWith' => $cloud->getUser(),
@@ -149,6 +150,7 @@ class MailPlugin implements ISearchPlugin {
 								$userResults['wide'][] = [
 									'label' => $displayName,
 									'uuid' => $contact['UID'],
+									'name' => $contact['FN'],
 									'value' => [
 										'shareType' => Share::SHARE_TYPE_USER,
 										'shareWith' => $cloud->getUser(),
@@ -168,6 +170,7 @@ class MailPlugin implements ISearchPlugin {
 						$result['exact'][] = [
 							'label' => $displayName,
 							'uuid' => $contact['UID'],
+							'name' => $contact['FN'],
 							'type' => $emailAddressType,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
@@ -178,6 +181,7 @@ class MailPlugin implements ISearchPlugin {
 						$result['wide'][] = [
 							'label' => $displayName,
 							'uuid' => $contact['UID'],
+							'name' => $contact['FN'],
 							'type' => $emailAddressType,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index abe9912551..0eab02ab0f 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -109,6 +109,7 @@ class RemotePlugin implements ISearchPlugin {
 						$result['exact'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
 							'uuid' => $contact['UID'],
+							'name' => $contact['FN'],
 							'type' => $cloudIdType,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
@@ -120,6 +121,7 @@ class RemotePlugin implements ISearchPlugin {
 						$result['wide'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
 							'uuid' => $contact['UID'],
+							'name' => $contact['FN'],
 							'type' => $cloudIdType,
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,

From a0d759b32460e0bb57011202df332d1bb6e7034a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 30 Oct 2018 10:18:58 +0100
Subject: [PATCH 20/24] Add uuid/name entry to Remote/MailPlugin tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../Collaborators/MailPlugin.php              |   5 +-
 .../Collaborators/MailPluginTest.php          | 114 +++++++++++++++---
 .../Collaborators/RemotePluginTest.php        |  10 +-
 3 files changed, 107 insertions(+), 22 deletions(-)

diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
index 1ac681c894..6faa5d5d12 100644
--- a/lib/private/Collaboration/Collaborators/MailPlugin.php
+++ b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -89,6 +89,7 @@ class MailPlugin implements ISearchPlugin {
 				}
 				foreach ($emailAddresses as $type => $emailAddress) {
 					$displayName = $emailAddress;
+					$emailAddressType = null;
 					if (\is_array($emailAddress)) {
 						$emailAddressData = $emailAddress;
 						$emailAddress = $emailAddressData['value'];
@@ -171,7 +172,7 @@ class MailPlugin implements ISearchPlugin {
 							'label' => $displayName,
 							'uuid' => $contact['UID'],
 							'name' => $contact['FN'],
-							'type' => $emailAddressType,
+							'type' => $emailAddressType ?? '',
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -182,7 +183,7 @@ class MailPlugin implements ISearchPlugin {
 							'label' => $displayName,
 							'uuid' => $contact['UID'],
 							'name' => $contact['FN'],
-							'type' => $emailAddressType,
+							'type' => $emailAddressType ?? '',
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
index 775941bd44..a9d0244d38 100644
--- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
@@ -120,16 +120,20 @@ class MailPluginTest extends TestCase {
 
 	public function dataGetEmail() {
 		return [
+			// data set 0
 			['test', [], true, ['emails' => [], 'exact' => ['emails' => []]], false, false],
+			// data set 1
 			['test', [], false, ['emails' => [], 'exact' => ['emails' => []]], false, false],
+			// data set 2
 			[
 				'test@remote.com',
 				[],
 				true,
-				['emails' => [], 'exact' => ['emails' => [['label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
+				['emails' => [], 'exact' => ['emails' => [['uuid' => 'test@remote.com', 'label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
 				false,
 				false,
 			],
+			// data set 3
 			[ // no valid email address
 				'test@remote',
 				[],
@@ -138,26 +142,31 @@ class MailPluginTest extends TestCase {
 				false,
 				false,
 			],
+			// data set 4
 			[
 				'test@remote.com',
 				[],
 				false,
-				['emails' => [], 'exact' => ['emails' => [['label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
+				['emails' => [], 'exact' => ['emails' => [['uuid' => 'test@remote.com', 'label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
 				false,
 				false,
 			],
+			// data set 5
 			[
 				'test',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'EMAIL' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'EMAIL' => [
 							'username@localhost',
@@ -165,22 +174,26 @@ class MailPluginTest extends TestCase {
 					],
 				],
 				true,
-				['emails' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exact' => ['emails' => []]],
+				['emails' => [['uuid' => 'uid1', 'name' => 'User @ Localhost', 'type' => '', 'label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exact' => ['emails' => []]],
 				false,
 				false,
 			],
+			// data set 6
 			[
 				'test',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'EMAIL' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'EMAIL' => [
 							'username@localhost',
@@ -192,18 +205,22 @@ class MailPluginTest extends TestCase {
 				false,
 				false,
 			],
+			// data set 7
 			[
 				'test@remote.com',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'EMAIL' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'EMAIL' => [
 							'username@localhost',
@@ -211,22 +228,26 @@ class MailPluginTest extends TestCase {
 					],
 				],
 				true,
-				['emails' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exact' => ['emails' => [['label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
+				['emails' => [['uuid' => 'uid1', 'name' => 'User @ Localhost', 'type' => '', 'label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exact' => ['emails' => [['label' => 'test@remote.com', 'uuid' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
 				false,
 				false,
 			],
+			// data set 8
 			[
 				'test@remote.com',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'EMAIL' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'EMAIL' => [
 							'username@localhost',
@@ -234,22 +255,26 @@ class MailPluginTest extends TestCase {
 					],
 				],
 				false,
-				['emails' => [], 'exact' => ['emails' => [['label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
+				['emails' => [], 'exact' => ['emails' => [['label' => 'test@remote.com', 'uuid' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
 				false,
 				false,
 			],
+			// data set 9
 			[
 				'username@localhost',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'EMAIL' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'EMAIL' => [
 							'username@localhost',
@@ -257,22 +282,26 @@ class MailPluginTest extends TestCase {
 					],
 				],
 				true,
-				['emails' => [], 'exact' => ['emails' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]]]],
+				['emails' => [], 'exact' => ['emails' => [['name' => 'User @ Localhost', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]]]],
 				true,
 				false,
 			],
+			// data set 10
 			[
 				'username@localhost',
 				[
 					[
+						'UID' => 'uid1',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'EMAIL' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'EMAIL' => [
 							'username@localhost',
@@ -280,23 +309,27 @@ class MailPluginTest extends TestCase {
 					],
 				],
 				false,
-				['emails' => [], 'exact' => ['emails' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]]]],
+				['emails' => [], 'exact' => ['emails' => [['name' => 'User @ Localhost', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]]]],
 				true,
 				false,
 			],
+			// data set 11
 			// contact with space
 			[
 				'user name@localhost',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'EMAIL' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User Name @ Localhost',
 						'EMAIL' => [
 							'user name@localhost',
@@ -304,23 +337,27 @@ class MailPluginTest extends TestCase {
 					],
 				],
 				false,
-				['emails' => [], 'exact' => ['emails' => [['label' => 'User Name @ Localhost (user name@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'user name@localhost']]]]],
+				['emails' => [], 'exact' => ['emails' => [['name' => 'User Name @ Localhost', 'uuid' => 'uid1', 'type' => '', 'label' => 'User Name @ Localhost (user name@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'user name@localhost']]]]],
 				true,
 				false,
 			],
+			// data set 12
 			// remote with space, no contact
 			[
 				'user space@remote.com',
 				[
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3 @ Localhost',
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2 @ Localhost',
 						'EMAIL' => [
 						],
 					],
 					[
+						'UID' => 'uid1',
 						'FN' => 'User @ Localhost',
 						'EMAIL' => [
 							'username@localhost',
@@ -332,11 +369,13 @@ class MailPluginTest extends TestCase {
 				false,
 				false,
 			],
+			// data set 13
 			// Local user found by email
 			[
 				'test@example.com',
 				[
 					[
+						'UID' => 'uid1',
 						'FN' => 'User',
 						'EMAIL' => ['test@example.com'],
 						'CLOUD' => ['test@localhost'],
@@ -344,15 +383,17 @@ class MailPluginTest extends TestCase {
 					]
 				],
 				false,
-				['users' => [], 'exact' => ['users' => [['label' => 'User (test@example.com)','value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test'],]]]],
+				['users' => [], 'exact' => ['users' => [['uuid' => 'uid1', 'name' => 'User', 'label' => 'User (test@example.com)','value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test'],]]]],
 				true,
 				false,
 			],
+			// data set 14
 			// Current local user found by email => no result
 			[
 				'test@example.com',
 				[
 					[
+						'UID' => 'uid1',
 						'FN' => 'User',
 						'EMAIL' => ['test@example.com'],
 						'CLOUD' => ['current@localhost'],
@@ -364,29 +405,34 @@ class MailPluginTest extends TestCase {
 				false,
 				false,
 			],
+			// data set 15
 			// Pagination and "more results" for user matches byyyyyyy emails
 			[
 				'test@example',
 				[
 					[
+						'UID' => 'uid1',
 						'FN' => 'User1',
 						'EMAIL' => ['test@example.com'],
 						'CLOUD' => ['test1@localhost'],
 						'isLocalSystemBook' => true,
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2',
 						'EMAIL' => ['test@example.de'],
 						'CLOUD' => ['test2@localhost'],
 						'isLocalSystemBook' => true,
 					],
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3',
 						'EMAIL' => ['test@example.org'],
 						'CLOUD' => ['test3@localhost'],
 						'isLocalSystemBook' => true,
 					],
 					[
+						'UID' => 'uid4',
 						'FN' => 'User4',
 						'EMAIL' => ['test@example.net'],
 						'CLOUD' => ['test4@localhost'],
@@ -395,32 +441,37 @@ class MailPluginTest extends TestCase {
 				],
 				true,
 				['users' => [
-					['label' => 'User1 (test@example.com)', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'User2 (test@example.de)', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+					['uuid' => 'uid1', 'name' => 'User1', 'label' => 'User1 (test@example.com)', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['uuid' => 'uid2', 'name' => 'User2', 'label' => 'User2 (test@example.de)', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 				], 'emails' => [], 'exact' => ['users' => [], 'emails' => []]],
 				false,
 				true,
 			],
+			// data set 16
 			// Pagination and "more results" for normal emails
 			[
 				'test@example',
 				[
 					[
+						'UID' => 'uid1',
 						'FN' => 'User1',
 						'EMAIL' => ['test@example.com'],
 						'CLOUD' => ['test1@localhost'],
 					],
 					[
+						'UID' => 'uid2',
 						'FN' => 'User2',
 						'EMAIL' => ['test@example.de'],
 						'CLOUD' => ['test2@localhost'],
 					],
 					[
+						'UID' => 'uid3',
 						'FN' => 'User3',
 						'EMAIL' => ['test@example.org'],
 						'CLOUD' => ['test3@localhost'],
 					],
 					[
+						'UID' => 'uid4',
 						'FN' => 'User4',
 						'EMAIL' => ['test@example.net'],
 						'CLOUD' => ['test4@localhost'],
@@ -428,12 +479,45 @@ class MailPluginTest extends TestCase {
 				],
 				true,
 				['emails' => [
-					['label' => 'User1 (test@example.com)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@example.com']],
-					['label' => 'User2 (test@example.de)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@example.de']],
+					['uuid' => 'uid1', 'name' => 'User1', 'type' => '', 'label' => 'User1 (test@example.com)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@example.com']],
+					['uuid' => 'uid2', 'name' => 'User2', 'type' => '', 'label' => 'User2 (test@example.de)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@example.de']],
 				], 'exact' => ['emails' => []]],
 				false,
 				true,
 			],
+			// data set 17
+			// multiple email addresses with type
+			[
+				'User Name',
+				[
+					[
+						'UID' => 'uid3',
+						'FN' => 'User3',
+					],
+					[
+						'UID' => 'uid2',
+						'FN' => 'User2',
+						'EMAIL' => [
+						],
+					],
+					[
+						'UID' => 'uid1',
+						'FN' => 'User Name',
+						'EMAIL' => [
+							['type' => 'HOME', 'value' => 'username@localhost'],
+							['type' => 'WORK', 'value' => 'username@other'],
+						],
+					],
+				],
+				false,
+				['emails' => [
+				], 'exact' => ['emails' => [
+					['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'HOME', 'label' => 'User Name (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']],
+					['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'WORK', 'label' => 'User Name (username@other)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@other']]
+				]]],
+				false,
+				false,
+			],
 		];
 	}
 
@@ -513,7 +597,7 @@ class MailPluginTest extends TestCase {
 						'UID' => 'User'
 					]
 				],
-				['users' => [['label' => 'User (test@example.com)','value' => ['shareType' => 0, 'shareWith' => 'test'],]], 'emails' => [], 'exact' => ['emails' => [], 'users' => []]],
+				['users' => [['label' => 'User (test@example.com)', 'uuid' => 'User', 'name' => 'User', 'value' => ['shareType' => 0, 'shareWith' => 'test'],]], 'emails' => [], 'exact' => ['emails' => [], 'users' => []]],
 				false,
 				false,
 				[
@@ -553,7 +637,7 @@ class MailPluginTest extends TestCase {
 						'UID' => 'User'
 					]
 				],
-				['emails' => [], 'exact' => ['emails' => [['label' => 'test@example.com', 'value' => ['shareType' => 4,'shareWith' => 'test@example.com']]]]],
+				['emails' => [], 'exact' => ['emails' => [['label' => 'test@example.com', 'uuid' => 'test@example.com', 'value' => ['shareType' => 4,'shareWith' => 'test@example.com']]]]],
 				false,
 				false,
 				[
diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
index e253f2dfc9..e763965989 100644
--- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -176,7 +176,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				true,
-				['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => ['remotes' => []]],
+				['remotes' => [['name' => 'User @ Localhost', 'label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => ['remotes' => []]],
 				false,
 				true,
 			],
@@ -228,7 +228,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				true,
-				['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => ['remotes' => [['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']]]]],
+				['remotes' => [['name' => 'User @ Localhost', 'label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => ['remotes' => [['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']]]]],
 				false,
 				true,
 			],
@@ -280,7 +280,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				true,
-				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]]]],
+				['remotes' => [], 'exact' => ['remotes' => [['name' => 'User @ Localhost', 'label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]]]],
 				true,
 				true,
 			],
@@ -306,7 +306,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				false,
-				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]]]],
+				['remotes' => [], 'exact' => ['remotes' => [['name' => 'User @ Localhost', 'label' => 'User @ Localhost (username@localhost)', 'uuid' => 'uid1', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]]]],
 				true,
 				true,
 			],
@@ -333,7 +333,7 @@ class RemotePluginTest extends TestCase {
 					],
 				],
 				false,
-				['remotes' => [], 'exact' => ['remotes' => [['label' => 'User Name @ Localhost (user name@localhost)', 'uuid' => 'uid3', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'user name@localhost', 'server' => 'localhost']]]]],
+				['remotes' => [], 'exact' => ['remotes' => [['name' => 'User Name @ Localhost', 'label' => 'User Name @ Localhost (user name@localhost)', 'uuid' => 'uid3', 'type' => '', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'user name@localhost', 'server' => 'localhost']]]]],
 				true,
 				true,
 			],

From e6952edaf450c6a74e38eac27d1de37b1934d6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 30 Oct 2018 11:37:11 +0100
Subject: [PATCH 21/24] Don't enforce merged property
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index c255152e66..082bf9571d 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -339,15 +339,11 @@
 						 * merged contacts, if the search term matches its contact name
 						 */
 						for (i = 0; i < groupedLength; i++) {
-							console.log(grouped[i]);
 							if (typeof grouped[i].uuid !== 'undefined' && grouped[i].uuid === previousUuid) {
 								grouped[i].merged = true;
-							} else {
-								grouped[i].merged = false;
 							}
-							if (searchTerm === grouped[i].name || grouped[i].merged === false) {
+							if (searchTerm === grouped[i].name || typeof grouped[i].merged === 'undefined') {
 								result.push(grouped[i]);
-							} else {
 							}
 							previousUuid = grouped[i].uuid;
 						}

From 5a73a9b9ded91b15ca044d27ac2cf42fb483af93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 30 Oct 2018 11:41:56 +0100
Subject: [PATCH 22/24] Fix injection to get the user id
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../Collaboration/Collaborators/RemotePlugin.php     | 11 +++++++----
 .../Collaboration/Collaborators/RemotePluginTest.php | 12 +++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index 0eab02ab0f..d877346b15 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -31,6 +31,7 @@ use OCP\Contacts\IManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\IConfig;
 use OCP\IUserManager;
+use OCP\IUserSession;
 use OCP\Share;
 
 class RemotePlugin implements ISearchPlugin {
@@ -45,15 +46,17 @@ class RemotePlugin implements ISearchPlugin {
 	/** @var IUserManager */
 	private $userManager;
 	/** @var string */
-	private $userId;
+	private $userId = '';
 
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager, $userId) {
+	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager, IUserSession $userSession) {
 		$this->contactsManager = $contactsManager;
 		$this->cloudIdManager = $cloudIdManager;
 		$this->config = $config;
 		$this->userManager = $userManager;
-		$this->userId = $userId;
-
+		$user = $userSession->getUser();
+		if ($user !== null) {
+			$this->userId = $user->getUID();
+		}
 		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
 	}
 
diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
index e763965989..aff6818576 100644
--- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -31,7 +31,9 @@ use OCP\Collaboration\Collaborators\SearchResultType;
 use OCP\Contacts\IManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\IConfig;
+use OCP\IUser;
 use OCP\IUserManager;
+use OCP\IUserSession;
 use OCP\Share;
 use Test\TestCase;
 
@@ -66,7 +68,15 @@ class RemotePluginTest extends TestCase {
 	}
 
 	public function instantiatePlugin() {
-		$this->plugin = new RemotePlugin($this->contactsManager, $this->cloudIdManager, $this->config, $this->userManager, 'admin');
+		$user = $this->createMock(IUser::class);
+		$user->expects($this->any())
+			->method('getUID')
+			->willReturn('admin');
+		$userSession = $this->createMock(IUserSession::class);
+		$userSession->expects($this->any())
+			->method('getUser')
+			->willReturn($user);
+		$this->plugin = new RemotePlugin($this->contactsManager, $this->cloudIdManager, $this->config, $this->userManager, $userSession);
 	}
 
 	/**

From b9c5e569d36fb57baae6c340d31970d5f852261e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 30 Oct 2018 14:43:08 +0100
Subject: [PATCH 23/24] Update AddressBookImpl documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/dav/lib/CardDAV/AddressBookImpl.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
index 4f2491e189..1aedd5d564 100644
--- a/apps/dav/lib/CardDAV/AddressBookImpl.php
+++ b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -88,7 +88,15 @@ class AddressBookImpl implements IAddressBook {
 	/**
 	 * @param string $pattern which should match within the $searchProperties
 	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - for future use. One should always have options!
+	 * @param array $options Options to define the output format
+	 * 	- types boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
+	 *    example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']]
+	 * @return array an array of contacts which are arrays of key-value-pairs
+	 *  example result:
+	 *  [
+	 *		['id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'],
+	 *		['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['d@e.f', 'g@h.i']]
+	 *	]
 	 * @return array an array of contacts which are arrays of key-value-pairs
 	 * @since 5.0.0
 	 */

From ffc32222f1686d520c0d27a482f45d1c258c64de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 30 Oct 2018 14:43:34 +0100
Subject: [PATCH 24/24] Styling papercuts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/css/sharetabview.scss | 5 +++++
 core/css/jquery-ui-fixes.scss            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index 526a5d3937..0d277c58bd 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -33,6 +33,11 @@
 		font-size: 90%;
 		opacity: 0.7;
 	}
+
+	.icon {
+		opacity: .7;
+		margin-right: 7px;
+	}
 }
 
 .shareTabView {
diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss
index d80d0c61e4..eab22e70d6 100644
--- a/core/css/jquery-ui-fixes.scss
+++ b/core/css/jquery-ui-fixes.scss
@@ -70,7 +70,7 @@
 .ui-widget-header .ui-state-highlight {
 	border: 1px solid var(--color-main-background);
 	background: var(--color-main-background) none;
-	color: var(--color-text-lighter);
+	color: var(--color-text-light);
 	font-weight: 600;
 }
 .ui-state-highlight a,