From 0575c0148627b48d5b0a47e435b7df99b1725acb Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sun, 5 Oct 2014 12:55:35 +0000 Subject: [PATCH 1/9] app version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index df8c8e5..3a3b2e6 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,6 +5,6 @@ Owncloud SMS app AGPL Loic Blot - 0.2.0 + 1.0.0 7 From f7594dfb265de51d104c997f1fa2d1e0fc4a23f7 Mon Sep 17 00:00:00 2001 From: Ner'zhul Date: Mon, 6 Oct 2014 12:38:55 +0200 Subject: [PATCH 2/9] Update README.md --- README.md | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a17d55b..ad2db4d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,18 @@ # Oc Sms + +## Introduction + +Oc Sms provides a webinterface to display your SMS conversations. + +SMS conversations are pushed by your Android devices using ownCloud Sms app (available on Google Play Store here: https://play.google.com/store/apps/details?id=fr.unix_experience.owncloud_sms) + +## Licence + +OcSMS web application is actually under AGPL licence but this free licence can be modificated to a better free licence. + +## Requirements +- An ownCloud instance + + +## Installation Place this app in **owncloud/apps/** - - -## Running tests -After [Installing PHPUnit](http://phpunit.de/getting-started.html) run: - - phpunit tests/ \ No newline at end of file From 79d57f32cebf66c96ae9bd929f8aea9413810084 Mon Sep 17 00:00:00 2001 From: Ner'zhul Date: Mon, 6 Oct 2014 12:39:21 +0200 Subject: [PATCH 3/9] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ad2db4d..5342a5f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ Oc Sms provides a webinterface to display your SMS conversations. -SMS conversations are pushed by your Android devices using ownCloud Sms app (available on Google Play Store here: https://play.google.com/store/apps/details?id=fr.unix_experience.owncloud_sms) +SMS conversations are pushed by your Android devices using ownCloud Sms app, available on Google Play Store + +Android download link: https://play.google.com/store/apps/details?id=fr.unix_experience.owncloud_sms ## Licence From 3ce5b7a69d753b8a5fbbfd84ea522ada5a366fc8 Mon Sep 17 00:00:00 2001 From: Ner'zhul Date: Mon, 6 Oct 2014 13:34:47 +0200 Subject: [PATCH 4/9] Remove example comment --- db/sms.php | 1 - 1 file changed, 1 deletion(-) diff --git a/db/sms.php b/db/sms.php index 7095b58..000de01 100644 --- a/db/sms.php +++ b/db/sms.php @@ -1,5 +1,4 @@ Date: Mon, 6 Oct 2014 13:41:18 +0200 Subject: [PATCH 5/9] Replace \OC_DB by \OCP\DB (need tests) --- db/smsmapper.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/db/smsmapper.php b/db/smsmapper.php index fd1260a..48ec313 100644 --- a/db/smsmapper.php +++ b/db/smsmapper.php @@ -33,7 +33,7 @@ class SmsMapper extends Mapper { } public function getAllIds ($userId) { - $query = \OC_DB::prepare('SELECT sms_id, sms_mailbox FROM ' . + $query = \OCP\DB::prepare('SELECT sms_id, sms_mailbox FROM ' . '*PREFIX*ocsms_smsdatas WHERE user_id = ?'); $result = $query->execute(array($userId)); @@ -52,7 +52,7 @@ class SmsMapper extends Mapper { } public function getAllPeersPhoneNumbers ($userId) { - $query = \OC_DB::prepare('SELECT sms_address FROM ' . + $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)); @@ -66,7 +66,7 @@ class SmsMapper extends Mapper { } public function getAllMessagesForPhoneNumber ($userId, $phoneNumber, $minDate = 0) { - $query = \OC_DB::prepare('SELECT sms_date, sms_msg, sms_type FROM ' . + $query = \OCP\DB::prepare('SELECT sms_date, sms_msg, sms_type FROM ' . '*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_address = ? ' . 'AND sms_mailbox IN (?,?) AND sms_date > ?'); $result = $query->execute(array($userId, $phoneNumber, 0, 1, $minDate)); @@ -86,7 +86,7 @@ class SmsMapper extends Mapper { \OCP\DB::beginTransaction(); if ($purgeAllSmsBeforeInsert === true) { - $query = \OC_DB::prepare('DELETE FROM *PREFIX*ocsms_smsdatas ' . + $query = \OCP\DB::prepare('DELETE FROM *PREFIX*ocsms_smsdatas ' . 'WHERE user_id = ?'); $result = $query->execute(array($userId)); } @@ -101,14 +101,14 @@ class SmsMapper extends Mapper { if ($purgeAllSmsBeforeInsert === false) { // Remove previous record // @ TODO: only update the required fields, getAllIds can be useful - $query = \OC_DB::prepare('DELETE FROM *PREFIX*ocsms_smsdatas ' . + $query = \OCP\DB::prepare('DELETE FROM *PREFIX*ocsms_smsdatas ' . 'WHERE user_id = ? AND sms_id = ?'); $result = $query->execute(array( $userId, (int) $sms["_id"] )); } - $query = \OC_DB::prepare('INSERT INTO *PREFIX*ocsms_smsdatas ' . + $query = \OCP\DB::prepare('INSERT INTO *PREFIX*ocsms_smsdatas ' . '(user_id, added, lastmodified, sms_flags, sms_date, sms_id,' . 'sms_address, sms_msg, sms_mailbox, sms_type) VALUES ' . '(?,?,?,?,?,?,?,?,?,?)'); From 6394f7394dce3494cc59bfd04323447e1ce0ab9a Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Mon, 6 Oct 2014 14:14:56 +0200 Subject: [PATCH 6/9] Fix namespace for OcSmsApp into controller --- controller/smscontroller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controller/smscontroller.php b/controller/smscontroller.php index 20f4ea3..96012c0 100644 --- a/controller/smscontroller.php +++ b/controller/smscontroller.php @@ -16,6 +16,7 @@ use \OCP\IRequest; use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Controller; use \OCP\AppFramework\Http\JSONResponse; +use \OCA\OcSms\AppInfo\OcSmsApp; use \OCA\OcSms\Db\SmsMapper; class SmsController extends Controller { From 03b6c705626285d74291101fc42941125ab3f625 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Mon, 6 Oct 2014 15:21:45 +0200 Subject: [PATCH 7/9] verify is phoneNumber exists before fetching --- js/script.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/script.js b/js/script.js index 15d5eef..c419890 100644 --- a/js/script.js +++ b/js/script.js @@ -152,8 +152,12 @@ function changeSelectedConversation(item) { OC.Util.History.pushState('phonenumber=' + phoneNumber); // Reset it for refreshConversation lastMsgDate = 0; - fetchConversation(phoneNumber); - changeSelectedConversation($(this)); + + // phoneNumber must exist + if (phoneNumber != null) { + fetchConversation(phoneNumber); + changeSelectedConversation($(this)); + } event.preventDefault(); }); From 6e44d16a296d6ac2ed8ae1b633b383d0bceb08ba Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Mon, 6 Oct 2014 15:24:32 +0200 Subject: [PATCH 8/9] verify is curPhoneNumber exists before fetching --- js/script.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/js/script.js b/js/script.js index c419890..feb5a66 100644 --- a/js/script.js +++ b/js/script.js @@ -25,6 +25,11 @@ $.urlParam = function(name){ }; var refreshConversation = function() { + // if no conversation selected, then don't fetch page + if (curPhoneNumber == null) { + return; + } + $.getJSON(OC.generateUrl('/apps/ocsms/get/conversation'), { 'phoneNumber': curPhoneNumber, From ebda4d03302796ed566272a8b30aa4c70302ed7f Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Mon, 6 Oct 2014 13:27:33 +0000 Subject: [PATCH 9/9] JS: fix missing urlParam --- js/script.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/js/script.js b/js/script.js index feb5a66..bc95e9a 100644 --- a/js/script.js +++ b/js/script.js @@ -166,13 +166,16 @@ function changeSelectedConversation(item) { event.preventDefault(); }); - var urlPhoneNumber = decodeURIComponent($.urlParam('phonenumber')); - if (urlPhoneNumber != null) { - fetchConversation(urlPhoneNumber); + var pnParam = $.urlParam('phonenumber')); + if (pnParam != null) { + var urlPhoneNumber = decodeURIComponent(pnParam); + if (urlPhoneNumber != null) { + fetchConversation(urlPhoneNumber); - var pObject = $("a[mailbox-navigation='" + urlPhoneNumber + "']"); - if (pObject != null) { - changeSelectedConversation(pObject); + var pObject = $("a[mailbox-navigation='" + urlPhoneNumber + "']"); + if (pObject != null) { + changeSelectedConversation(pObject); + } } } });