commit 4f42d0f18265310551cf6fa2fe3b2af705871602
Author: Loic Blot <loic.blot@unix-experience.fr>
Date:   Fri Oct 10 12:01:49 2014 +0200

    Merge

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..04119f2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,51 @@
+# ownCloud SMS Android Application Offical Repository
+
+## Introduction
+
+ownCloud SMS app push your Android devices conversation into your ownCloud instance, using ocsms app.
+
+Android download link: https://play.google.com/store/apps/details?id=fr.unix_experience.owncloud_sms
+
+ocsms app sources are available here: https://github.com/nerzhul/ocsms/
+
+## Application documentation
+
+You can found application documentation here: https://github.com/nerzhul/ownCloud-SMS-App/wiki
+
+## Licence
+
+ownCloud SMS Android Application licence is in reflexion, then sources are partial.
+
+- App locales are under BSD 2 clause licence
+
+## Contributions
+
+We are searching for translations in others langs (german, spanish, russian).
+
+To contribute please download res/values/strings.xml and give us a translated version !
+
+## Requirements
+- An ownCloud instance with ocsms app
+
+
+## Issue template
+
+Server
+- ownCloud version: X.X.X
+- PHP version: X.X
+- HTTPd server: <apache|nginx...>
+- HTTPS: <yes|no>
+
+Client
+- Android version: X.X.X
+- Phone: <phone-model>
+- ownCloud SMS app version: X.X.X
+
+
+Please create your issues for the client here:
+
+https://github.com/nerzhul/ownCloud-SMS-App/issues
+
+And for the server app here:
+
+https://github.com/nerzhul/ocsms/issues
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
new file mode 100644
index 0000000..2e7f4f8
--- /dev/null
+++ b/res/values-fr/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /*
+ * Copyright (c) 2014, Loic Blot <loic.blot@unix-experience.fr>
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+-->
+<resources>
+
+    <string name="app_name">ownCloud-SMS</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="sync_now">Synchroniser maintenant</string>
+    
+    <!-- Preferences -->
+    <string name="pref_category_sync">Synchronisation</string>
+
+	<string name="title_global_pref_to_general_prefs">Préférences générales</string>
+	<string name="summary_global_pref_to_general_prefs">Options de synchronisation</string>
+	<string name="summary_notif_prefs">Notifications</string>
+	
+    <string name="pref_header_data_sync">Données &amp; synchronisation</string>
+    <string name="pref_title_sync_frequency">Fréquence de synchronisation</string>
+
+	<string name="title_activity_general_settings">Préférences générales</string>
+
+    <string-array name="pref_sync_frequency_titles">
+        <item>15 minutes</item>
+        <item>30 minutes</item>
+        <item>1 heure</item>
+        <item>3 heures</item>
+        <item>6 heures</item>
+        <item>12 heures</item>
+        <item>24 heures</item>
+        <item>Jamais</item>
+    </string-array>
+    <string-array name="pref_sync_frequency_values">
+        <item>15</item>
+        <item>30</item>
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>720</item>
+        <item>1440</item>
+        <item>-1</item>
+    </string-array>
+    
+    <string name="title_activity_login">Connexion</string>
+
+    <!-- Login -->
+    <string name="prompt_login">Identifiant</string>
+    <string name="prompt_password">Mot de passe </string>
+    <string name="action_sign_in">S\'enregistrer ou se connecter</string>
+    <string name="action_sign_in_short">Se connecter</string>
+    <string name="error_invalid_login">Identifiant ou mot de passe incorrect</string>
+    <string name="error_invalid_password">Ce mot de passe est trop court</string>
+    <string name="error_field_required">Ce champ est requis</string>
+    <string name="prompt_serverURI">Adresse du serveur</string>
+    <string name="error_invalid_server_address">Adresse invalide</string>
+    <string name="error_connection_failed">Echec de connexion, assurer vous qu\'il s\'agit du bon serveur</string>
+    <string name="error_http_connection_failed">Impossible d\'effectuer la connexion HTTP. Assurez vous qu\'il s\'agit d\'un serveur HTTP</string>
+    
+    <!-- Notifications -->
+    <string name="sync_title">Processus de synchronisation</string>
+    <string name="sync_inprogress">Synchonisation en cours...</string>
+    <string name="fatal_error">Erreur fatale ! </string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
new file mode 100644
index 0000000..fcefc92
--- /dev/null
+++ b/res/values/strings.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /*
+ * Copyright (c) 2014, Loic Blot <loic.blot@unix-experience.fr>
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+-->
+<resources>
+
+    <string name="app_name">ownCloud-SMS</string>
+    <string name="account_type">fr.unix_experience.owncloud_sms</string>
+    <string name="account_authority">fr.unix_experience.owncloud_sms.datasync.provider</string>
+    
+    <string name="target_package">fr.unix_experience.owncloud_sms</string>
+    <string name="pref_title_sync_frequency">Sync frequency</string>
+    
+    <!-- Translations must begin there -->
+    <!-- Preferences -->
+    <string name="action_settings">Settings</string>
+    <string name="sync_now">Synchronize now</string>
+    <string name="pref_category_sync">Synchronization</string>
+
+	<string name="title_global_pref_to_general_prefs">General preferences</string>
+	<string name="summary_global_pref_to_general_prefs">Sync options</string>
+	<string name="summary_notif_prefs">Notifications</string>
+	
+    <string name="pref_header_data_sync">Data &amp; sync</string>
+
+	<string name="title_activity_general_settings">General Settings</string>
+
+    <string name="pref_title_sync_frequency">Sync frequency</string>
+
+    <string-array name="pref_sync_frequency_titles">
+        <item>15 minutes</item>
+        <item>30 minutes</item>
+        <item>1 hour</item>
+        <item>3 hours</item>
+        <item>6 hours</item>
+        <item>12 hours</item>
+        <item>24 hours</item>
+        <item>Never</item>
+    </string-array>
+    <string-array name="pref_sync_frequency_values">
+        <item>15</item>
+        <item>30</item>
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>720</item>
+        <item>1440</item>
+        <item>-1</item>
+    </string-array>
+    
+    <string name="title_activity_login">Sign in</string>
+
+    <!-- Login -->
+    <string name="prompt_login">Login</string>
+    <string name="prompt_password">Password </string>
+    <string name="action_sign_in">Sign in or register</string>
+    <string name="action_sign_in_short">Sign in</string>
+    <string name="error_invalid_login">Login or password incorrect</string>
+    <string name="error_invalid_password">This password is too short</string>
+    <string name="error_field_required">This field is required</string>
+    <string name="prompt_serverURI">Server address</string>
+    <string name="error_invalid_server_address">Invalid server address</string>
+    <string name="error_connection_failed">Connection failed, ensure this is the right server</string>
+    <string name="error_http_connection_failed">Unable to perform a HTTP connection. Please ensure there is a web server</string>
+    
+    <string-array name="protocol_array">
+    	<item>https://</item>
+        <item>http://</item>
+    </string-array>
+    
+    <!-- Notifications -->
+    <string name="sync_title">Sync process</string>
+    <string name="sync_inprogress">Sync in progress...</string>
+    <string name="fatal_error">Fatal error ! </string>
+    
+</resources>
diff --git a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncService.java b/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncService.java
new file mode 100644
index 0000000..657142b
--- /dev/null
+++ b/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncService.java
@@ -0,0 +1,68 @@
+package fr.unix_experience.owncloud_sms.sync_adapters;
+
+/*
+ * Copyright (c) 2014, Loic Blot <loic.blot@unix-experience.fr>
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class SmsSyncService extends Service {
+    // Storage for an instance of the sync adapter
+    private static SmsSyncAdapter _adapter = null;
+    // Object to use as a thread-safe lock
+    private static final Object sSyncAdapterLock = new Object();
+    /*
+     * Instantiate the sync adapter object.
+     */
+    @Override
+    public void onCreate() {
+        /*
+         * Create the sync adapter as a singleton.
+         * Set the sync adapter as syncable
+         * Disallow parallel syncs
+         */
+        synchronized (sSyncAdapterLock) {
+            if (_adapter == null) {
+            	_adapter = new SmsSyncAdapter(getApplicationContext(), true);
+            }
+        }
+    }
+    /**
+     * Return an object that allows the system to invoke
+     * the sync adapter.
+     *
+     */
+    @Override
+    public IBinder onBind(Intent intent) {
+        /*
+         * Get the object that allows external processes
+         * to call onPerformSync(). The object is created
+         * in the base class code when the SyncAdapter
+         * constructors call super()
+         */
+        return _adapter.getSyncAdapterBinder();
+    }
+}