Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3171fee0 authored by Florent VINCENT's avatar Florent VINCENT 👾
Browse files

Merge branch 'file-sharing-fix' into 'master' 

set sharetype with IShare object, not deprecated Share one

See merge request !35
parents a73ac8f8 c105e439

patches/005-autocomplete-user-leak-core.patch

+4 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co 
+								'name' => $contact['FN'],

+								'type' => $emailAddressType ?? '',

+								'value' => [

+									'shareType' => Share::SHARE_TYPE_EMAIL,

+									'shareType' => IShare::TYPE_EMAIL,

+									'shareWith' => $emailAddress,

+								],

+							];
@@ -86,7 +86,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co 
+							$result['exact'][] = [

+								'label' => $displayName,

+								'value' => [

+									'shareType' => Share::SHARE_TYPE_USER,

+									'shareType' => IShare::TYPE_USER,

+									'shareWith' => $emailAddress,

+								],

+							];
@@ -111,7 +111,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co 
+								'name' => $contact['FN'],

+								'type' => $emailAddressType ?? '',

+								'value' => [

+									'shareType' => Share::SHARE_TYPE_EMAIL,

+									'shareType' => IShare::TYPE_EMAIL,

+									'shareWith' => $emailAddress,

+								],

+							];
@@ -124,7 +124,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co 
+							$result['wide'][] = [

+								'label' => $displayName,

+								'value' => [

+									'shareType' => Share::SHARE_TYPE_USER,

+									'shareType' => IShare::TYPE_USER,

+									'shareWith' => $emailAddress,

+								],

+							];