flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nextcloud/ocsms.git synced 2026-08-11 16:32:55 +00:00
Code Issues Releases Wiki Activity

Set contact colours on uids (#152)

Browse Source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ
2017-01-03 11:22:05 +01:00
committed by Ner'zhul
parent 3a669de201
commit 8296cdca78
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/smscontroller.php
+6 -2
View File
@@ -92,6 +92,7 @@ class SmsController extends Controller {
$contactsSrc = $this->contactCache->getContacts();
$contacts = array();
$photos = $this->contactCache->getContactPhotos();
$uids = $this->contactCache->getContactUids();
// Cache country because of loops
$configuredCountry = $this->configMapper->getCountry();
@@ -115,7 +116,7 @@ class SmsController extends Controller {
$photoversion = 2;
}
return new JSONResponse(array("phonelist" => $phoneList, "contacts" => $contacts, "lastRead" => $lastRead, "photos" => $photos, "photo_version" => $photoversion));
return new JSONResponse(array("phonelist" => $phoneList, "contacts" => $contacts, "lastRead" => $lastRead, "photos" => $photos, "uids" => $uids, "photo_version" => $photoversion));
}
/**
@@ -216,13 +217,16 @@ class SmsController extends Controller {
$phoneList = $this->smsMapper->getNewMessagesCountForAllPhonesNumbers($this->userId, $lastDate);
$contactsSrc = $this->contactCache->getContacts();
$photosSrc = $this->contactCache->getContactPhotos();
$uidsSrc = $this->contactCache->getContactUids();
$contacts = array();
$photos = array();
$uids = array();
foreach ($phoneList as $number => $ts) {
$fmtPN = preg_replace("#[ ]#","", $number);
if (isset($contactsSrc[$fmtPN])) {
$contacts[$fmtPN] = $contactsSrc[$fmtPN];
$uids[$fmtPN] = $uidsSrc[$fmtPN];
if (isset($photosSrc[$contacts[$fmtPN]])) {
$photos[$contacts[$fmtPN]] = $photosSrc[$contacts[$fmtPN]];
@@ -230,7 +234,7 @@ class SmsController extends Controller {
}
}
return new JSONResponse(array("phonelist" => $phoneList, "contacts" => $contacts, "photos" => $photos));
return new JSONResponse(array("phonelist" => $phoneList, "contacts" => $contacts, "photos" => $photos, "uids" => $uids));
}
/**