Skip to content

[stable21] Allow autocomplete based on phone sync #26056

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

Merged
rullzer merged 17 commits into from
Mar 11, 2021
Merged

[stable21] Allow autocomplete based on phone sync #26056

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ebb9f1d
Add a KnownUsers database with model
nickvergessen Mar 9, 2021
3feca65
Store when a user knows another user based on phone number
nickvergessen Mar 9, 2021
19ccc99
Delete matches when a user changes their phone number
nickvergessen Mar 9, 2021
5af22f8
Delete matches when the user is being deleted
nickvergessen Mar 9, 2021
88855d8
Add a service to find out if a user knows another user
nickvergessen Mar 9, 2021
52d43bf
Add a config setting to restrict autocompletion to phonebook matches
nickvergessen Mar 9, 2021
c7560ab
Restrict autocompletion also based on the phonebook known users
nickvergessen Mar 9, 2021
30610aa
Add integration tests for autocomplete/get (similar to sharees API)
nickvergessen Mar 10, 2021
8069c52
Add a hint that the settings are OR based
nickvergessen Mar 10, 2021
77f6d76
Add a setting to restrict returning a full match unless in phonebook …
nickvergessen Mar 10, 2021
5afaf3d
Fix CS hopefully
nickvergessen Mar 10, 2021
72fb176
Change label also in the acceptance tests
nickvergessen Mar 10, 2021
49f7d08
Also execute the new tests on drone
nickvergessen Mar 10, 2021
490bfa7
Also clear the knownUser when changing via the settings endpoint
nickvergessen Mar 10, 2021
99c1eda
Bump version to run migration
nickvergessen Mar 10, 2021
5fa52d4
Rename some parameters and methods to make the API more clear
nickvergessen Mar 10, 2021
62ef450
Clean up the logic of the contacts store a bit
nickvergessen Mar 10, 2021
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
Prev Previous commit
Clean up the logic of the contacts store a bit 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Mar 11, 2021
commit 62ef45028ea3990993a3513ca37ae80c7ff8e245
10 changes: 5 additions & 5 deletions lib/private/Contacts/ContactsMenu/ContactsStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,21 +165,21 @@ private function filterContacts(IUser $self,
return false;
}

$filterUser = true;
$filterOutUser = true;

$mailAddresses = $entry->getEMailAddresses();
foreach ($mailAddresses as $mailAddress) {
if ($mailAddress === $filter) {
$filterUser = false;
$filterOutUser = false;
break;
}
}

if ($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
$filterUser = false;
$filterOutUser = false;
}

if ($filterUser) {
if ($filterOutUser) {
return false;
}
} elseif ($restrictEnumerationPhone || $restrictEnumerationGroup) {
Expand Down Expand Up @@ -208,7 +208,7 @@ private function filterContacts(IUser $self,
if ($ownGroupsOnly && !$checkedCommonGroupAlready) {
$user = $this->userManager->get($entry->getProperty('UID'));

if ($user === null) {
if (!$user instanceof IUser) {
return false;
}

Expand Down