From 0fcaad6d31f22b4d0355115820765ce1c134f44e Mon Sep 17 00:00:00 2001 From: "Loic BLOT (@UXP)" Date: Fri, 10 Apr 2015 13:21:56 +0200 Subject: [PATCH 1/4] Implement Android APIv2 get/phones/smsnumber call --- appinfo/routes.php | 2 +- controller/apicontroller.php | 7 +++++-- controller/smscontroller.php | 2 +- db/smsmapper.php | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index ae38d18..01b62a7 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -27,5 +27,5 @@ $application->registerRoutes($this, array('routes' => array( array('name' => 'api#retrieve_all_ids', 'url' => '/get/smsidlist', 'verb' => 'GET'), // Android APIv1 array('name' => 'api#retrieve_all_ids_with_status', 'url' => '/get/smsidstate', 'verb' => 'GET'), // Android APIv1 array('name' => 'api#retrieve_last_timestamp', 'url' => '/get/lastmsgtime', 'verb' => 'GET'), // Android APIv1 - array('name' => 'api#get_phones_sms_number', 'url' => 'get/phones/smsnumber', 'verb' => 'GET'), // Android APIv2 + array('name' => 'api#get_all_stored_phone_numbers', 'url' => 'get/phones/smsnumber', 'verb' => 'GET'), // Android APIv2 ))); diff --git a/controller/apicontroller.php b/controller/apicontroller.php index a893e31..395f9bb 100644 --- a/controller/apicontroller.php +++ b/controller/apicontroller.php @@ -82,9 +82,12 @@ class ApiController extends Controller { /** * @NoAdminRequired * @NoCSRFRequired + * + * This function is used by API v2 + * Phone will get this list to generate a ListView */ - public function getPhonesSmsNumber () { - $phoneList = array(); + public function getAllStoredPhoneNumbers () { + $phoneList = $this->smsMapper->getAllPhoneNumbers($this->userId); return new JSONResponse(array("phoneList" => $phoneList)); } diff --git a/controller/smscontroller.php b/controller/smscontroller.php index 7051037..d599a10 100644 --- a/controller/smscontroller.php +++ b/controller/smscontroller.php @@ -54,7 +54,7 @@ class SmsController extends Controller { $mboxes = array( 'PNLConversations' => array( 'label' => 'Conversations', - 'phoneNumbers' => $this->smsMapper->getAllPeersPhoneNumbers($this->userId), + 'phoneNumbers' => $this->smsMapper->getAllPhoneNumbers($this->userId), 'url' => $this->urlGenerator->linkToRoute('ocsms.sms.index', ['feed' => 'conversations']) ), 'PNLDrafts' => array( diff --git a/db/smsmapper.php b/db/smsmapper.php index eea2aec..3d0f5a4 100644 --- a/db/smsmapper.php +++ b/db/smsmapper.php @@ -93,7 +93,7 @@ class SmsMapper extends Mapper { return 0; } - public function getAllPeersPhoneNumbers ($userId) { + public function getAllPhoneNumbers ($userId) { $query = \OCP\DB::prepare('SELECT sms_address FROM ' . '*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_mailbox IN (?,?)'); $result = $query->execute(array($userId, 0, 1)); @@ -109,8 +109,8 @@ class SmsMapper extends Mapper { } /* - get all possible SMS_adresses for a given formated phonenumber - */ + * get all possible SMS_adresses for a given formated phonenumber + */ public function getAllPhoneNumbersForFPN ($userId, $phoneNumber, $country) { $query = \OCP\DB::prepare('SELECT sms_address FROM ' . '*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_mailbox IN (?,?)'); From 66b25374ae37c7c17407f3c779be6066fc4036a2 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Thu, 23 Apr 2015 13:11:53 +0800 Subject: [PATCH 2/4] Added Australia's country code: http://www.australia.gov.au/about-australia/our-country/telephone-country-and-area-codes. --- lib/countrycodes.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/countrycodes.php b/lib/countrycodes.php index 26595f0..1cab2d1 100644 --- a/lib/countrycodes.php +++ b/lib/countrycodes.php @@ -19,6 +19,7 @@ class CountryCodes { "Andorra" => "+376", "Armenia" => "+374", "Austria" => "+43", + "Australia" => "+61", "Belarus" => "+375", "Belgium" => "+32", "Bosnia and Herzegovina" => "+387", From 1bd067323be6b10bb52f474b6d6da245ac21658c Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 28 Apr 2015 17:04:05 +0200 Subject: [PATCH 3/4] Use a better name for route to retrieve phone number list --- appinfo/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index 01b62a7..4d3aea0 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -27,5 +27,5 @@ $application->registerRoutes($this, array('routes' => array( array('name' => 'api#retrieve_all_ids', 'url' => '/get/smsidlist', 'verb' => 'GET'), // Android APIv1 array('name' => 'api#retrieve_all_ids_with_status', 'url' => '/get/smsidstate', 'verb' => 'GET'), // Android APIv1 array('name' => 'api#retrieve_last_timestamp', 'url' => '/get/lastmsgtime', 'verb' => 'GET'), // Android APIv1 - array('name' => 'api#get_all_stored_phone_numbers', 'url' => 'get/phones/smsnumber', 'verb' => 'GET'), // Android APIv2 + array('name' => 'api#get_all_stored_phone_numbers', 'url' => 'get/phones/numberlist', 'verb' => 'GET'), // Android APIv2 ))); From 47a6a86a9509de7bcda6d736b9c6b8160b76cba8 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 15 May 2015 08:57:45 +0200 Subject: [PATCH 4/4] Ajust key and value length for ocsms_config table --- appinfo/database.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/database.xml b/appinfo/database.xml index 0044812..bf15bbb 100644 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -117,13 +117,13 @@ key text true - 25555 + 255 value text false - 25555 + 10240