Synchronise roster with Contacts app

.gitignore

@@ -4,4 +4,5 @@ phpunit.phar
 /build
 node_modules
 js/vendor
-js/main.min.js
+js/main.min.js
+/.project

Gruntfile.js

@@ -44,11 +44,23 @@ module.exports = function(grunt) {
 				src: 'js/src/bower_components/strophejs/strophe.js',
 				dest: 'js/vendor/strophe.js'
 			}
+		},
+		concat : {
+			dist : {
+				src: [
+					'js/src/chat.js',
+					'js/src/**/*.js',
+					'!js/src/bower_components/**/*.js',
+					'!js/src/vendor/**/*.js'
+				],
+				dest : 'js/main.min.js'
+			}
 		}
 	});
 
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-cssmin');
+	grunt.loadNpmTasks('grunt-contrib-concat');
 	grunt.registerTask('default', ['uglify', 'cssmin']);
 
 };

app/chat.php

@@ -70,7 +70,8 @@ public function __construct(array $urlParams = array()) {
 			return new AppController(
 				$c->query('AppName'),
 				$c->query('Request'),
-				$app
+				$app,
+				$c->query('ContactsManager')
 			);
 		});
 

appinfo/routes.php

@@ -31,6 +31,16 @@
 			'name' => 'config#set',
 			'url' => '/config/set',
 			'verb' => 'post'
+		),
+		array(
+			'name' => 'app#addContact',
+			'url' => '/contacts/add/',
+			'verb' => 'post'
+		),
+		array(
+			'name' => 'app#removeContact',
+			'url' => '/contacts/remove/',
+			'verb' => 'post'
 		)
 	)
 ));

controller/appcontroller.php

@@ -13,17 +13,19 @@
 use \OCP\AppFramework\Http\JSONResponse;
 use \OCP\AppFramework\Http\TemplateResponse;
 use \OCA\Chat\App\Chat;
+use \OCP\Contacts\IManager;
 
 class AppController extends Controller {
 
 	private $app;
 
 	private $c;
 
-	public function __construct($appName, IRequest $request,  Chat $app){
+	public function __construct($appName, IRequest $request,  Chat $app, IManager $cm){
 		parent::__construct($appName, $request);
 		$this->app = $app;
 		$this->c = $app->getContainer();
+		$this->cm = $cm;
 	}
 
 	/**
@@ -47,7 +49,6 @@ public function index() {
 			$backendsToArray[$backend->getId()] = $backend->toArray();
 		}
 		$initConvs = $this->app->getInitConvs();
-
 		$params = array(
 			"initvar" => json_encode(array(
 				"contacts" => $contacts['contacts'],
@@ -70,4 +71,43 @@ public function contacts(){
 		return new JSONResponse($this->app->getContacts());
 	}
 
+	/**
+	 * @NoAdminRequired
+	 * @return JSONResponse
+	 */
+	public function addContact($contacts){
+
+		$addressbooks = $this->cm->getAddressBooks();
+		$key = array_search('Contacts', $addressbooks);
+
+		// Create contacts
+		$ids = array();
+		foreach ($contacts as $contact){
+			$r = $this->cm->createOrUpdate($contact, $key);
+			$ids[] = $r->getId();
+		}
+
+		// Return just created contacts as contacts which can be used by the Chat app
+		$contacts =  $this->app->getContacts();
+		$newContacts = array();
+		foreach ($ids as $id){
+			$newContacts[$id] = $contacts['contactsObj'][$id];
+		}
+
+		return $newContacts;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @return JSONResponse
+	 */
+	public function removeContact($contacts){
+		// Create contacts
+		$ids = array();
+		foreach ($contacts as $contact){
+			$this->cm->delete($contact, 'local:1');
+		}
+
+	}
+
 }

css/src/app-navigation.css

@@ -53,9 +53,13 @@
 	height: 60px;
 }
 
+.conv-list-item-buttons div {
+	float:right;
+}
 .conv-list-item-buttons{
 	float:right;
-	width:20px;
+	width:40px;
+	height: 40px !important;
 }
 
 .heightInvite {

css/src/settings.css

@@ -22,4 +22,9 @@
 .backend-config-save {
 	margin-left: 10px;
 	width:80px;
+}
+
+.setting-error {
+	color: red;
+	font-weight: bold;
 }