rename app.js to legacy.js, move globals to app.js in Sms object and helpers to a dedicated file

js/devel/README.md

@@ -0,0 +1,7 @@
+# Generate bundle
+
+Use uglifyjs to generate app.min.js bundle
+
+```
+uglifyjs devel/*.js > app.min.js
+```

js/devel/app.js

@@ -0,0 +1,45 @@
+/**
+ * Nextcloud - Phone Sync
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Loic Blot <loic.blot@unix-experience.fr>
+ * @copyright Loic Blot 2014-2017
+ */
+
+var Sms = {
+	selectedConversation: null,
+	unreadCountCurrentConv: 0,
+	unreadCountAllConv: 0,
+	unreadCountNotifStep: 12,
+	lastUnreadCountAllConv: 0,
+	originalTitle: document.title
+};
+
+var ContactRenderer = {
+	generateColor: function (input) {
+		if (typeof input === 'undefined') {
+			return '';
+		}
+		// Check if core has the new color generator
+		if (typeof input.toHsl === 'function') {
+			var hsl = input.toHsl();
+			return 'hsl(' + hsl[0] + ', ' + hsl[1] + '%, ' + hsl[2] + '%)';
+		} else {
+			// If not, we use the old one
+			/* global md5 */
+			var hash = md5(input).substring(0, 4),
+				maxRange = parseInt('ffff', 16),
+				hue = parseInt(hash, 16) / maxRange * 256;
+			return 'hsl(' + hue + ', 90%, 65%)';
+		}
+	},
+	generateFirstCharacter: function (input) {
+		if (input.charAt(0) === '+') {
+			return '#';
+		}
+
+		return input.charAt(0);
+	}
+};

js/devel/helpers.js

@@ -0,0 +1,29 @@
+/**
+ * Nextcloud - Phone Sync
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Loic Blot <loic.blot@unix-experience.fr>
+ * @copyright Loic Blot 2014-2017
+ */
+
+function inArray(val, arr) {
+	return ($.inArray(val, arr) !== -1);
+}
+
+function arrayUnique(arr) {
+	return arr.filter(function (item, i, arr) {
+		return i === arr.indexOf(item);
+	});
+}
+
+function toBool(str) {
+	if (str === "true") {
+		return true;
+	}
+	else if (str === "false") {
+		return false;
+	}
+	return null;
+}

js/devel/legacy.js

@@ -0,0 +1,528 @@
+/**
+ * Nextcloud - Phone Sync
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Loic Blot <loic.blot@unix-experience.fr>
+ * @copyright Loic Blot 2014-2017
+ */
+
+var app = angular.module('OcSms', []);
+
+app.directive('toInt', function () {
+	return {
+		require: 'ngModel',
+		link: function (scope, element, attrs, modelCtrl) {
+			modelCtrl.$parsers.push(function (inputValue) {
+				return parseInt(inputValue, 10);
+			});
+		}
+	};
+});
+
+// Imported from contact app
+app.filter('peerColor', function () {
+	return ContactRenderer.generateColor;
+});
+
+app.filter('firstCharacter', function () {
+	return ContactRenderer.generateFirstCharacter;
+});
+
+
+app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile',
+	function ($scope, $interval, $timeout, $compile) {
+		$scope.lastConvMessageDate = 0;
+		$scope.lastContactListMsgDate = 0;
+		$scope.isConvLoading = false;
+		$scope.isContactsLoading = true;
+		$scope.buttons = [
+			{text: "Send"}
+		];
+
+		$scope.setting_msgLimit = 100;
+		$scope.setting_enableNotifications = 1;
+		$scope.setting_contactOrder = 'lastmsg';
+		$scope.setting_contactOrderReverse = true;
+
+		$scope.contacts = [];
+		$scope.messages = [];
+		$scope.totalMessageCount = 0;
+		$scope.photoVersion = 1;
+		$scope.selectedContact = {};
+		$scope.lastSearch = '';
+
+		$scope.generateUrl = function (endpoint) {
+			var winRegexp = /(.*)\/ocsms.*/;
+			var match = winRegexp.exec(window.location.href);
+			if (match.length !== 2) {
+				console.log("A very bad error happened when parsing window location");
+			}
+			return match[1] + '/ocsms' + endpoint;
+		};
+
+		// Settings
+		$scope.sendCountry = function () {
+			$.post($scope.generateUrl('/set/country'), {'country': $('select[name=intl_phone]').val()});
+		};
+
+		$scope.setMessageLimit = function () {
+			if ($scope.setting_msgLimit === null || $scope.setting_msgLimit === undefined) {
+				return;
+			}
+			$.post($scope.generateUrl('/set/msglimit'), {'limit': $scope.setting_msgLimit});
+		};
+
+		$scope.setNotificationSetting = function () {
+			if ($scope.setting_enableNotifications < 0 || $scope.setting_enableNotifications > 2) {
+				$scope.setting_enableNotifications = 0;
+				return;
+			}
+			$.post($scope.generateUrl('/set/notification_state'), {'notification': $scope.setting_enableNotifications});
+		};
+
+		$scope.setContactOrderSetting = function () {
+			$.post($scope.generateUrl('/set/contact_order'),
+				{
+					'attribute': $scope.setting_contactOrder,
+					'reverse': $scope.setting_contactOrderReverse
+				}
+			);
+		};
+
+		// Conversations
+		$scope.loadConversation = function (contact) {
+			OC.Util.History.pushState('phonenumber=' + contact.nav);
+
+			// phoneNumber must exist
+			if (contact.nav !== null) {
+				$scope.fetchConversation(contact);
+				changeSelectedConversation($("a[mailbox-navigation='" + contact.nav + "']"));
+			}
+		};
+
+		$scope.fetchConversation = function (contact) {
+			// If contact is not null, we will fetch a conversation for a new contact
+			if (contact != null) {
+				$scope.selectedContact = contact;
+				$scope.isConvLoading = true;
+			}
+
+			$scope.messages = [];
+			$scope.lastConvMessageDate = 0;
+
+			$.getJSON($scope.generateUrl('/front-api/v1/conversation'), {'phoneNumber': $scope.selectedContact.nav},
+				function (jsondata, status) {
+					var phoneNumberLabel = $scope.selectedContact.nav;
+
+					if (typeof jsondata['phoneNumbers'] !== 'undefined') {
+						var phoneNumberList = arrayUnique(jsondata['phoneNumbers']);
+						phoneNumberLabel = phoneNumberList.toString();
+					}
+
+					// Reinit messages before showing conversation
+					$scope.formatConversation(jsondata);
+
+					$scope.$apply(function () {
+						if (typeof jsondata['contactName'] === 'undefined' || jsondata['contactName'] === '') {
+							$scope.selectedContact.label = phoneNumberLabel;
+							$scope.selectedContact.opt_numbers = "";
+						}
+						else {
+							$scope.selectedContact.label = jsondata['contactName'];
+							$scope.selectedContact.opt_numbers = phoneNumberLabel;
+						}
+
+						$scope.totalMessageCount = jsondata['msgCount'] !== undefined ? jsondata['msgCount'] : 0;
+						$scope.isConvLoading = false;
+					});
+
+					$('#app-content').scrollTop(1E10);
+				}
+			);
+		};
+		$scope.refreshConversation = function () {
+			$.getJSON($scope.generateUrl('/ocsms/front-api/v1/conversation'),
+				{
+					'phoneNumber': $scope.selectedContact.nav,
+					"lastDate": $scope.lastConvMessageDate
+				},
+				function (jsondata, status) {
+					var fmt = $scope.formatConversation(jsondata);
+					var conversationBuf = fmt[1];
+					if (conversationBuf === true) {
+						$('#app-content').scrollTop(1E10);
+						// This will blink the tab because there is new messages
+						if (document.hasFocus() === false) {
+							Sms.unreadCountCurrentConv += parseInt(fmt[0]);
+							document.title = Sms.originalTitle + " (" + Sms.unreadCountCurrentConv + ")";
+							$scope.desktopNotify(Sms.unreadCountCurrentConv + " unread message(s) in conversation with " + $scope.selectedContact.label);
+						}
+
+					}
+
+					$scope.totalMessageCount = jsondata['msgCount'] !== undefined ? parseInt(jsondata['msgCount']) : 0;
+				}
+			);
+		};
+		$scope.checkNewMessages = function () {
+			Sms.unreadCountAllConv = 0;
+			$.getJSON($scope.generateUrl('/front-api/v1/new_messages'),
+				{'lastDate': $scope.lastContactListMsgDate},
+				function (jsondata, status) {
+					var bufferedContacts = [];
+
+					$.each(jsondata['phonelist'], function (id, val) {
+						var fn, peerLabel;
+						if (typeof jsondata['contacts'][id] === 'undefined') {
+							peerLabel = id;
+						}
+						else {
+							fn = jsondata['contacts'][id];
+							peerLabel = fn;
+						}
+
+						if (!inArray(peerLabel, bufferedContacts)) {
+							var contactObj = {
+								'label': peerLabel,
+								'nav': id,
+								'unread': parseInt(val)
+							};
+
+							if (typeof jsondata['photos'][peerLabel] !== 'undefined') {
+								contactObj.avatar = jsondata['photos'][peerLabel];
+							}
+
+							if (typeof jsondata['uids'][peerLabel] !== 'undefined') {
+								contactObj.uid = jsondata['uids'][peerLabel];
+							} else {
+								contactObj.uid = peerLabel;
+							}
+
+							$scope.modifyContact(contactObj);
+							bufferedContacts.push(peerLabel);
+
+							// Re-set conversation because we reload the element
+							if (id === $scope.selectedContact.nav) {
+								changeSelectedConversation($("a[mailbox-navigation='" + id + "']"));
+							}
+
+							Sms.unreadCountAllConv += parseInt(val);
+						}
+					});
+
+					/*
+					* Decrement notification step counter, but stop it a zero
+					* Stop at zero permit to notify instanly the user when 
+					* there is new messages in all conversations
+					*/
+
+					if (Sms.unreadCountNotifStep > 0) {
+						Sms.unreadCountNotifStep--;
+					}
+
+					if (Sms.unreadCountAllConv > 0) {
+						/*
+						* We notify user every two minutes for all messages
+						* or if unreadCount changes
+						*/
+						if (Sms.unreadCountNotifStep === 0 || Sms.lastUnreadCountAllConv !== Sms.unreadCountAllConv) {
+							$scope.desktopNotify(Sms.unreadCountAllConv + " unread message(s) for all conversations");
+							Sms.unreadCountNotifStep = 12;
+							Sms.lastUnreadCountAllConv = Sms.unreadCountAllConv;
+						}
+					}
+				}
+			);
+		};
+
+		$scope.removeConversation = function () {
+			$.post($scope.generateUrl('/delete/conversation'), {"contact": $scope.selectedContact.label}, function (data) {
+				// Reinit main window
+				$scope.selectedContact.label = "";
+				$scope.selectedContact.opt_numbers = "";
+				$scope.selectedContact.avatar = undefined;
+				$scope.removeContact($scope.selectedContact);
+				$scope.$apply(function () {
+					$scope.messages = [];
+				});
+				$scope.selectedContact.nav = "";
+				OC.Util.History.pushState('');
+			});
+		};
+
+		$scope.filterSms = function (query) {
+			if (query !== $scope.lastSearch) {
+			}
+		};
+
+		OC.Plugins.register('OCA.Search', {
+			attach: function (search) {
+				search.setFilter('sms', $scope.filterSms);
+			}
+		});
+
+		/*
+		* Contact list management
+		*/
+		$scope.addContact = function (ct) {
+			$scope.$apply(function () {
+				$scope.contacts.push(ct);
+			});
+		};
+
+		$scope.removeContact = function (ct) {
+			var len = $scope.contacts.length;
+			for (var i = 0; i < len; i++) {
+				var curCt = $scope.contacts[i];
+				if (curCt['nav'] === ct['nav']) {
+					$scope.$apply(function () {
+						$scope.contacts.splice(i, 1);
+					});
+					return;
+				}
+			}
+		};
+
+		$scope.modifyContact = function (ct) {
+			var len = $scope.contacts.length;
+			for (var i = 0; i < len; i++) {
+				if ($scope.contacts[i]['nav'] === ct['nav']) {
+					$scope.$apply(function () {
+						$scope.contacts[i].unread = parseInt(ct.unread);
+						if (typeof(ct.avatar) !== 'undefined') {
+							$scope.contacts[i].avatar = ct.avatar;
+						}
+					});
+				}
+			}
+		};
+
+		/*
+		* Conversation messagelist management
+		*/
+		$scope.addConversationMessage = function (msg) {
+			$scope.$apply(function () {
+				$scope.messages.push(msg);
+			});
+		};
+
+		$scope.removeConversationMessage = function (msgId) {
+			var len = $scope.messages.length;
+			for (var i = 0; i < len; i++) {
+				var curMsg = $scope.messages[i];
+				if (curMsg['id'] === msgId) {
+					$.post($scope.generateUrl('/delete/message'),
+						{"messageId": msgId, "phoneNumber": $scope.selectedContact.label}, function (data) {
+							$scope.$apply(function () {
+								$scope.messages.splice(i, 1);
+							});
+						});
+					return;
+				}
+			}
+		};
+
+		$scope.fetchInitialSettings = function () {
+			$.getJSON($scope.generateUrl('/front-api/v1/settings'), function (jsondata, status) {
+				if (jsondata['status'] === true) {
+					$('#sel_intl_phone').val(jsondata["country"]);
+
+					$('input[name=setting_msg_per_page]').val(parseInt(jsondata["message_limit"]));
+					$('select[name=setting_notif]').val(jsondata["notification_state"]);
+					$('select[name=setting_contact_order]').val(jsondata["contact_order"]);
+					$('input[name=setting_contact_order_reverse').val(toBool(jsondata["contact_order_reverse"]));
+
+					$scope.setting_msgLimit = parseInt(jsondata["message_limit"]);
+					$scope.setting_enableNotifications = jsondata["notification_state"];
+					$scope.setting_contactOrder = jsondata["contact_order"];
+					$scope.setting_contactOrderReverse = toBool(jsondata["contact_order_reverse"]);
+				}
+			});
+		};
+
+		$scope.fetchInitialPeerList = function (jsondata) {
+			// Use a buffer for better jQuery performance
+			var bufferedContacts = [];
+
+			$scope.photoVersion = jsondata["photo_version"];
+
+			$.each(jsondata['phonelist'], function (id, val) {
+				var peerLabel;
+				if (typeof jsondata['contacts'][id] === 'undefined') {
+					peerLabel = id;
+				}
+				else {
+					peerLabel = jsondata['contacts'][id];
+				}
+				if (!inArray(peerLabel, bufferedContacts)) {
+					var contactObj = {
+						'label': peerLabel,
+						'nav': id,
+						'unread': 0,
+						'lastmsg': parseInt(val)
+					};
+
+					if (typeof(jsondata['photos'][peerLabel]) !== 'undefined') {
+						contactObj['avatar'] = jsondata['photos'][peerLabel];
+					}
+
+					if (typeof jsondata['uids'][peerLabel] !== 'undefined') {
+						contactObj.uid = jsondata['uids'][peerLabel];
+					} else {
+						contactObj.uid = peerLabel;
+					}
+
+					$scope.addContact(contactObj);
+					bufferedContacts.push(peerLabel);
+				}
+			});
+
+			$scope.$apply(function () {
+				$scope.isContactsLoading = false;
+			});
+
+			$scope.lastContactListMsgDate = jsondata["lastRead"];
+		};
+
+
+		$scope.initDesktopNotifies = function () {
+			if (!("Notification" in window)) {
+				return;
+			}
+
+			Notification.requestPermission(function (permission) {
+				if (!('permission' in Notification)) {
+					Notification.permission = permission;
+				}
+			});
+		};
+
+		// Return (int) msgCount, (str) htmlConversation
+		$scope.formatConversation = function (jsondata) {
+			// Improve jQuery performance
+			var buf = false;
+			// Improve JS performance
+			var msgClass = '';
+			var msgCount = 0;
+
+			$.each(jsondata["conversation"], function (id, vals) {
+				if (vals["type"] === 1) {
+					msgClass = "recv";
+				}
+				else if (vals["type"] === 2) {
+					msgClass = "sent";
+				}
+				else {
+					msgClass = '';
+				}
+
+				// Store the greater msg date for refresher
+				// Note: we divide by 100 because number compare too large integers
+				if ((id / 100) > ($scope.lastConvMessageDate / 100)) {
+					$scope.lastConvMessageDate = id;
+
+					// Multiplicate ID to permit date to use it properly
+					$scope.addConversationMessage({
+						'id': id,
+						'type': msgClass,
+						'date': new Date(id * 1),
+						'content': vals['msg']
+					});
+					buf = true;
+					msgCount++;
+				}
+
+			});
+			return [msgCount, buf];
+		};
+
+		$scope.desktopNotify = function (msg) {
+			if ($scope.setting_enableNotifications === 0) {
+				return;
+			}
+
+			if (!("Notification" in window)) {
+				return;
+			}
+			else if (Notification.permission === "granted") {
+				new Notification("Phone Sync - " + msg);
+			}
+			else if (Notification.permission !== 'denied') {
+				Notification.requestPermission(function (permission) {
+					if (!('permission' in Notification)) {
+						Notification.permission = permission;
+					}
+					if (permission === "granted") {
+						new Notification("Phone Sync - " + msg);
+					}
+				});
+			}
+		};
+
+		$interval($scope.refreshConversation, 10000);
+		$interval($scope.checkNewMessages, 10000);
+
+		$timeout(function () {
+			// Register real title
+			Sms.originalTitle = document.title;
+
+			// Now bind the events when we click on the phone number
+			$.getJSON($scope.generateUrl('/front-api/v1/peerlist'), function (jsondata, status) {
+				$scope.fetchInitialPeerList(jsondata);
+
+				var pnParam = $.urlParam('phonenumber');
+				if (pnParam != null) {
+					var urlPhoneNumber = decodeURIComponent(pnParam);
+					if (urlPhoneNumber != null) {
+						// If no contact when loading, creating a new contact from urlPhoneNumber
+						if ($scope.selectedContact.nav === undefined) {
+							$scope.selectedContact.label = urlPhoneNumber;
+							$scope.selectedContact.nav = urlPhoneNumber;
+							$scope.selectedContact.avatar = undefined;
+						}
+						$scope.fetchConversation(null);
+						changeSelectedConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']"));
+					}
+				}
+			});
+			$scope.fetchInitialSettings();
+			$scope.initDesktopNotifies();
+			$scope.checkNewMessages();
+		});
+	}
+]);
+
+$.urlParam = function (name) {
+	var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+	if (results == null) {
+		return null;
+	}
+	else {
+		return results[1] || 0;
+	}
+};
+
+function changeSelectedConversation(item) {
+	if (item === 'undefined' || item == null) {
+		return;
+	}
+
+	if (Sms.selectedConversation != null) {
+		Sms.selectedConversation.parent().removeClass('selected');
+	}
+	Sms.selectedConversation = item;
+	Sms.selectedConversation.parent().addClass('selected');
+	Sms.selectedConversation.css("font-weight", "normal");
+	Sms.selectedConversation.html(Sms.selectedConversation.attr("mailbox-label"));
+}
+
+(function ($, OC) {
+	// reset count and title
+	window.onfocus = function () {
+		Sms.unreadCountCurrentConv = 0;
+		document.title = Sms.originalTitle;
+	};
+})(jQuery, OC);
+