Skip to content

Expose CLOUD federation for local users in the recent addressbook #23379

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
skjnldsv merged 2 commits into from
Oct 12, 2020
Merged

Expose CLOUD federation for local users in the recent addressbook #23379

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
698d4f5
Expose CLOUD federation for local users as well
skjnldsv Oct 12, 2020
5a6a5a1
Drop X-NEXTCLOUD-UID
skjnldsv Oct 12, 2020
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
Drop X-NEXTCLOUD-UID 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Oct 12, 2020
commit 5a6a5a16393eb93e94bf325cd1e3b16e5647e4bf
3 changes: 0 additions & 3 deletions apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ private function generateCard(RecentContact $contact): string {
'CATEGORIES' => $this->l10n->t('Recently contacted'),
];

if ($contact->getUid() !== null) {
$props['X-NEXTCLOUD-UID'] = $contact->getUid();
}
if ($contact->getEmail() !== null) {
$props['EMAIL'] = $contact->getEmail();
}
Expand Down
1 change: 0 additions & 1 deletion apps/contactsinteraction/tests/Db/RecentContactMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ protected function createRecentContact(string $email = null, string $federatedCl
'URI' => UUIDUtil::getUUID(),
'FN' => 'Foo Bar',
'CATEGORIES' => 'Recently contacted',
'X-NEXTCLOUD-UID' => 'foobar',
];

$time = $this->time->getDateTime();
Expand Down