diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/ic_launcher-web.png b/ic_launcher-web.png deleted file mode 100644 index a169e78..0000000 Binary files a/ic_launcher-web.png and /dev/null differ diff --git a/lint.xml b/lint.xml deleted file mode 100644 index ee0eead..0000000 --- a/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/project.properties b/project.properties deleted file mode 100644 index 0da0934..0000000 --- a/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-22 -android.library.reference.1=../Owncloud-Android-Library diff --git a/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to src/main/AndroidManifest.xml diff --git a/src/fr/unix_experience/owncloud_sms/activities/GeneralSettingsActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/GeneralSettingsActivity.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/activities/GeneralSettingsActivity.java rename to src/main/java/fr/unix_experience/owncloud_sms/activities/GeneralSettingsActivity.java diff --git a/src/fr/unix_experience/owncloud_sms/activities/LoginActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/activities/LoginActivity.java rename to src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java diff --git a/src/fr/unix_experience/owncloud_sms/activities/MainActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/activities/MainActivity.java rename to src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java diff --git a/src/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java rename to src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java diff --git a/src/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java similarity index 66% rename from src/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java rename to src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java index aa975d4..62d81e8 100644 --- a/src/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java @@ -1,15 +1,20 @@ package fr.unix_experience.owncloud_sms.activities.remote_account; +import java.util.ArrayList; + import android.accounts.Account; import android.accounts.AccountManager; import android.app.ListActivity; import android.os.Bundle; +import fr.nrz.androidlib.adapters.AndroidAccountAdapter; import fr.unix_experience.owncloud_sms.R; +import fr.unix_experience.owncloud_sms.adapters.ContactListAdapter; import fr.unix_experience.owncloud_sms.engine.ASyncContactLoad; public class ContactListActivity extends ListActivity implements ASyncContactLoad { static AccountManager _accountMgr; + ContactListAdapter adapter; @Override protected void onCreate(final Bundle savedInstanceState) { @@ -25,10 +30,21 @@ public class ContactListActivity extends ListActivity implements ASyncContactLoa _accountMgr = AccountManager.get(getBaseContext()); final Account[] myAccountList = _accountMgr.getAccountsByType(getString(R.string.account_type)); + + // Init view + ArrayList objects = new ArrayList(); + setContentView(R.layout.restore_activity_contactlist); + adapter = new ContactListAdapter(getBaseContext(), + android.R.layout.simple_list_item_1, + objects, + R.layout.contact_list_item, + R.id.contactname); + + setListAdapter(adapter); for (final Account element : myAccountList) { if (element.name.equals(accountName)) { - new ContactLoadTask(element, getBaseContext()).execute(); + new ContactLoadTask(element, getBaseContext(), adapter, objects).execute(); return; } } diff --git a/src/main/java/fr/unix_experience/owncloud_sms/adapters/ContactListAdapter.java b/src/main/java/fr/unix_experience/owncloud_sms/adapters/ContactListAdapter.java new file mode 100644 index 0000000..d22ab9b --- /dev/null +++ b/src/main/java/fr/unix_experience/owncloud_sms/adapters/ContactListAdapter.java @@ -0,0 +1,52 @@ +package fr.unix_experience.owncloud_sms.adapters; + +import java.util.ArrayList; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.view.View.OnClickListener; +import android.widget.ArrayAdapter; +import android.widget.TextView; + +public class ContactListAdapter extends ArrayAdapter { + private final ArrayList _objects; + private static int _itemLayout; + private static int _fieldId; + + public ContactListAdapter(final Context context, final int resource, + final ArrayList objects, final int itemLayout, + final int fieldId) { + super(context, resource, resource, objects); + _objects = objects; + _itemLayout = itemLayout; + _fieldId = fieldId; + } + + @Override + public View getView(final int position, final View convertView, final ViewGroup parent) { + View v = convertView; + if (v == null) { + final LayoutInflater inflater = + (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); + v = inflater.inflate(_itemLayout, null); + } + + final String element = _objects.get(position); + + if (element != null) { + final TextView label = (TextView) v.findViewById(_fieldId); + if (label != null) { + label.setText(element + " >"); + label.setOnClickListener(new OnClickListener() { + @Override + public void onClick(final View v) { + // @TODO + } + }); + } + } + + return v; + } +} diff --git a/src/fr/unix_experience/owncloud_sms/authenticators/OwnCloudAuthenticator.java b/src/main/java/fr/unix_experience/owncloud_sms/authenticators/OwnCloudAuthenticator.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/authenticators/OwnCloudAuthenticator.java rename to src/main/java/fr/unix_experience/owncloud_sms/authenticators/OwnCloudAuthenticator.java diff --git a/src/fr/unix_experience/owncloud_sms/authenticators/OwnCloudAuthenticatorService.java b/src/main/java/fr/unix_experience/owncloud_sms/authenticators/OwnCloudAuthenticatorService.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/authenticators/OwnCloudAuthenticatorService.java rename to src/main/java/fr/unix_experience/owncloud_sms/authenticators/OwnCloudAuthenticatorService.java diff --git a/src/fr/unix_experience/owncloud_sms/broadcast_receivers/ConnectivityChanged.java b/src/main/java/fr/unix_experience/owncloud_sms/broadcast_receivers/ConnectivityChanged.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/broadcast_receivers/ConnectivityChanged.java rename to src/main/java/fr/unix_experience/owncloud_sms/broadcast_receivers/ConnectivityChanged.java diff --git a/src/fr/unix_experience/owncloud_sms/broadcast_receivers/IncomingSms.java b/src/main/java/fr/unix_experience/owncloud_sms/broadcast_receivers/IncomingSms.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/broadcast_receivers/IncomingSms.java rename to src/main/java/fr/unix_experience/owncloud_sms/broadcast_receivers/IncomingSms.java diff --git a/src/fr/unix_experience/owncloud_sms/defines/DefaultPrefs.java b/src/main/java/fr/unix_experience/owncloud_sms/defines/DefaultPrefs.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/defines/DefaultPrefs.java rename to src/main/java/fr/unix_experience/owncloud_sms/defines/DefaultPrefs.java diff --git a/src/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java similarity index 51% rename from src/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java rename to src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java index b1fd296..9640812 100644 --- a/src/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncContactLoad.java @@ -1,33 +1,46 @@ package fr.unix_experience.owncloud_sms.engine; +import java.util.ArrayList; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + import android.accounts.Account; import android.accounts.AccountManager; import android.content.Context; import android.net.Uri; import android.os.AsyncTask; +import android.util.Log; +import fr.unix_experience.owncloud_sms.adapters.ContactListAdapter; import fr.unix_experience.owncloud_sms.exceptions.OCSyncException; public interface ASyncContactLoad { - class ContactLoadTask extends AsyncTask { + class ContactLoadTask extends AsyncTask { private static AccountManager _accountMgr = null; private static Account _account; private final Context _context; + private ContactListAdapter _adapter; + private ArrayList _objects; - public ContactLoadTask(final Account account, final Context context) { + public ContactLoadTask(final Account account, final Context context, + ContactListAdapter adapter, ArrayList objects) { if (_accountMgr == null) { _accountMgr = AccountManager.get(context); } _account = account; _context = context; + _adapter = adapter; + _objects = objects; } @Override - protected Void doInBackground(final Void... params) { + protected Boolean doInBackground(final Void... params) { // Create client final String ocURI = _accountMgr.getUserData(_account, "ocURI"); if (ocURI == null) { // @TODO: Handle the problem - return null; + return false; } final Uri serverURI = Uri.parse(ocURI); @@ -39,15 +52,33 @@ public interface ASyncContactLoad { try { if (_client.getServerAPIVersion() < 2) { // @TODO: handle error + return false; } - _client.getServerPhoneNumbers(); + + JSONArray phoneNumbers = _client.getServerPhoneNumbers(); + Log.d(TAG, phoneNumbers.toString()); + for (int i = 0; i < phoneNumbers.length(); i++) { + String phone = phoneNumbers.getString(i); + _objects.add(phone); + } + + } catch (JSONException e) { + // @TODO: handle error + e.printStackTrace(); + return false; } catch (final OCSyncException e) { // @TODO: handle error + e.printStackTrace(); + return false; } - return null; + return true; } + + protected void onPostExecute(final Boolean success) { + _adapter.notifyDataSetChanged(); + } } - static final String TAG = ASyncSMSSync.class.getSimpleName(); + static final String TAG = ASyncContactLoad.class.getSimpleName(); } diff --git a/src/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java rename to src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java diff --git a/src/fr/unix_experience/owncloud_sms/engine/ConnectivityMonitor.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/ConnectivityMonitor.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/engine/ConnectivityMonitor.java rename to src/main/java/fr/unix_experience/owncloud_sms/engine/ConnectivityMonitor.java diff --git a/src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java similarity index 98% rename from src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java rename to src/main/java/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java index ead905b..ce58b80 100644 --- a/src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java @@ -44,6 +44,7 @@ import fr.unix_experience.owncloud_sms.enums.OCSyncErrorType; import fr.unix_experience.owncloud_sms.exceptions.OCSyncException; import fr.unix_experience.owncloud_sms.prefs.OCSMSSharedPrefs; +@SuppressWarnings("deprecation") public class OCSMSOwnCloudClient { public OCSMSOwnCloudClient(final Context context, final Uri serverURI, final String accountName, final String accountPassword) { @@ -86,8 +87,9 @@ public class OCSMSOwnCloudClient { return null; } + Log.d(TAG, obj.toString()); try { - return obj.getJSONArray("phonelist"); + return obj.getJSONArray("phoneList"); } catch (final JSONException e) { Log.e(TAG, "No phonelist received from server, empty it", e); return null; @@ -99,7 +101,6 @@ public class OCSMSOwnCloudClient { * If we need other API push, set it here */ switch (_serverAPIVersion) { - case 2: doPushRequestV2(smsList); break; case 1: default: doPushRequestV1(smsList); break; } @@ -192,10 +193,6 @@ public class OCSMSOwnCloudClient { Log.d(TAG, "SMS Push request said: status " + pushStatus + " - " + pushMessage); } - public void doPushRequestV2(final JSONArray smsList) throws OCSyncException { - - } - public GetMethod createGetVersionRequest() { return createGetRequest(OC_GET_VERSION); } diff --git a/src/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java rename to src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java diff --git a/src/fr/unix_experience/owncloud_sms/enums/LoginReturnCode.java b/src/main/java/fr/unix_experience/owncloud_sms/enums/LoginReturnCode.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/enums/LoginReturnCode.java rename to src/main/java/fr/unix_experience/owncloud_sms/enums/LoginReturnCode.java diff --git a/src/fr/unix_experience/owncloud_sms/enums/MailboxID.java b/src/main/java/fr/unix_experience/owncloud_sms/enums/MailboxID.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/enums/MailboxID.java rename to src/main/java/fr/unix_experience/owncloud_sms/enums/MailboxID.java diff --git a/src/fr/unix_experience/owncloud_sms/enums/OCSMSNotificationType.java b/src/main/java/fr/unix_experience/owncloud_sms/enums/OCSMSNotificationType.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/enums/OCSMSNotificationType.java rename to src/main/java/fr/unix_experience/owncloud_sms/enums/OCSMSNotificationType.java diff --git a/src/fr/unix_experience/owncloud_sms/enums/OCSyncErrorType.java b/src/main/java/fr/unix_experience/owncloud_sms/enums/OCSyncErrorType.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/enums/OCSyncErrorType.java rename to src/main/java/fr/unix_experience/owncloud_sms/enums/OCSyncErrorType.java diff --git a/src/fr/unix_experience/owncloud_sms/exceptions/OCSyncException.java b/src/main/java/fr/unix_experience/owncloud_sms/exceptions/OCSyncException.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/exceptions/OCSyncException.java rename to src/main/java/fr/unix_experience/owncloud_sms/exceptions/OCSyncException.java diff --git a/src/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationManager.java b/src/main/java/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationManager.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationManager.java rename to src/main/java/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationManager.java diff --git a/src/fr/unix_experience/owncloud_sms/observers/SmsObserver.java b/src/main/java/fr/unix_experience/owncloud_sms/observers/SmsObserver.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/observers/SmsObserver.java rename to src/main/java/fr/unix_experience/owncloud_sms/observers/SmsObserver.java diff --git a/src/fr/unix_experience/owncloud_sms/prefs/OCSMSSharedPrefs.java b/src/main/java/fr/unix_experience/owncloud_sms/prefs/OCSMSSharedPrefs.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/prefs/OCSMSSharedPrefs.java rename to src/main/java/fr/unix_experience/owncloud_sms/prefs/OCSMSSharedPrefs.java diff --git a/src/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java b/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java rename to src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java diff --git a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSlowSyncService.java b/src/main/java/fr/unix_experience/owncloud_sms/sync_adapters/SmsSlowSyncService.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSlowSyncService.java rename to src/main/java/fr/unix_experience/owncloud_sms/sync_adapters/SmsSlowSyncService.java diff --git a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java b/src/main/java/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java rename to src/main/java/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java diff --git a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncService.java b/src/main/java/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncService.java similarity index 100% rename from src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncService.java rename to src/main/java/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncService.java diff --git a/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/ic_stat_ocsms.png b/src/main/res/drawable-hdpi/ic_stat_ocsms.png similarity index 100% rename from res/drawable-hdpi/ic_stat_ocsms.png rename to src/main/res/drawable-hdpi/ic_stat_ocsms.png diff --git a/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_stat_ocsms.png b/src/main/res/drawable-mdpi/ic_stat_ocsms.png similarity index 100% rename from res/drawable-mdpi/ic_stat_ocsms.png rename to src/main/res/drawable-mdpi/ic_stat_ocsms.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_stat_ocsms.png b/src/main/res/drawable-xhdpi/ic_stat_ocsms.png similarity index 100% rename from res/drawable-xhdpi/ic_stat_ocsms.png rename to src/main/res/drawable-xhdpi/ic_stat_ocsms.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_stat_ocsms.png b/src/main/res/drawable-xxhdpi/ic_stat_ocsms.png similarity index 100% rename from res/drawable-xxhdpi/ic_stat_ocsms.png rename to src/main/res/drawable-xxhdpi/ic_stat_ocsms.png diff --git a/res/drawable/ic_launcher.png b/src/main/res/drawable/ic_launcher.png similarity index 100% rename from res/drawable/ic_launcher.png rename to src/main/res/drawable/ic_launcher.png diff --git a/res/drawable/ic_stat_ocsms.png b/src/main/res/drawable/ic_stat_ocsms.png similarity index 100% rename from res/drawable/ic_stat_ocsms.png rename to src/main/res/drawable/ic_stat_ocsms.png diff --git a/res/drawable/login_logo.png b/src/main/res/drawable/login_logo.png similarity index 100% rename from res/drawable/login_logo.png rename to src/main/res/drawable/login_logo.png diff --git a/res/drawable/next_arrow.png b/src/main/res/drawable/next_arrow.png similarity index 100% rename from res/drawable/next_arrow.png rename to src/main/res/drawable/next_arrow.png diff --git a/res/drawable/standard_button.xml b/src/main/res/drawable/standard_button.xml similarity index 97% rename from res/drawable/standard_button.xml rename to src/main/res/drawable/standard_button.xml index b8fd39b..3955778 100644 --- a/res/drawable/standard_button.xml +++ b/src/main/res/drawable/standard_button.xml @@ -1,4 +1,4 @@ - + + + * 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. + */ +--> + + + + + \ No newline at end of file diff --git a/res/values-cs/google_playstore_strings.xml b/src/main/res/values-cs/google_playstore_strings.xml similarity index 97% rename from res/values-cs/google_playstore_strings.xml rename to src/main/res/values-cs/google_playstore_strings.xml index 32091b3..9ebe84f 100644 --- a/res/values-cs/google_playstore_strings.xml +++ b/src/main/res/values-cs/google_playstore_strings.xml @@ -27,7 +27,7 @@ --> - 3 + 3 ownCloud SMS synchronizuje vaše lokální SMS zprávy na váš server ownCloud diff --git a/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml similarity index 100% rename from res/values-cs/strings.xml rename to src/main/res/values-cs/strings.xml diff --git a/res/values-de/google_playstore_strings.xml b/src/main/res/values-de/google_playstore_strings.xml similarity index 97% rename from res/values-de/google_playstore_strings.xml rename to src/main/res/values-de/google_playstore_strings.xml index d25601d..a1374f0 100644 --- a/res/values-de/google_playstore_strings.xml +++ b/src/main/res/values-de/google_playstore_strings.xml @@ -27,7 +27,7 @@ --> - 3 + 3 Mit ownCloud SMS kannst Du Deine SMS mit Deiner ownCloud synchronisieren diff --git a/res/values-de/strings.xml b/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to src/main/res/values-de/strings.xml diff --git a/res/values/google_playstore_strings.xml b/src/main/res/values-en/google_playstore_strings.xml similarity index 97% rename from res/values/google_playstore_strings.xml rename to src/main/res/values-en/google_playstore_strings.xml index 3dc357e..092d465 100644 --- a/res/values/google_playstore_strings.xml +++ b/src/main/res/values-en/google_playstore_strings.xml @@ -27,7 +27,7 @@ --> - 3 + 3 ownCloud SMS synchronize your local SMS on your ownCloud instance diff --git a/res/values-en/strings.xml b/src/main/res/values-en/strings.xml similarity index 100% rename from res/values-en/strings.xml rename to src/main/res/values-en/strings.xml diff --git a/res/values-es/google_playstore_strings.xml b/src/main/res/values-es/google_playstore_strings.xml similarity index 74% rename from res/values-es/google_playstore_strings.xml rename to src/main/res/values-es/google_playstore_strings.xml index be6660b..1db8bed 100644 --- a/res/values-es/google_playstore_strings.xml +++ b/src/main/res/values-es/google_playstore_strings.xml @@ -27,13 +27,13 @@ --> - 0 - ownCloud SMS sincroniza sus mensajes SMS locales en su servidor ownCloud - - La aplicación ownCloud SMS sincroniza sus mensajes SMS en un servidor ownCloud remoto y le permite leer sus mensajes desde él. + 0 + ownCloud SMS sincroniza sus mensajes SMS locales en su servidor ownCloud + + La aplicación ownCloud SMS sincroniza sus mensajes SMS en un servidor ownCloud remoto y le permite leer sus mensajes desde él. - El envio de SMS desde el servidor ownCloud será implementado en futuras versiones. + El envio de SMS desde el servidor ownCloud será implementado en futuras versiones. - La aplicación es totalmente compatible con Android 4.0 a 5.0 - + La aplicación es totalmente compatible con Android 4.0 a 5.0 + diff --git a/res/values-es/strings.xml b/src/main/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to src/main/res/values-es/strings.xml diff --git a/res/values-fr/google_playstore_strings.xml b/src/main/res/values-fr/google_playstore_strings.xml similarity index 97% rename from res/values-fr/google_playstore_strings.xml rename to src/main/res/values-fr/google_playstore_strings.xml index 64ad66c..3114867 100644 --- a/res/values-fr/google_playstore_strings.xml +++ b/src/main/res/values-fr/google_playstore_strings.xml @@ -27,7 +27,7 @@ --> - 3 + 3 ownCloud SMS permet de synchroniser vos SMS sur votre instance ownCloud diff --git a/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to src/main/res/values-fr/strings.xml diff --git a/res/values-sr/google_playstore_strings.xml b/src/main/res/values-sr/google_playstore_strings.xml similarity index 97% rename from res/values-sr/google_playstore_strings.xml rename to src/main/res/values-sr/google_playstore_strings.xml index 52a9426..58e9889 100644 --- a/res/values-sr/google_playstore_strings.xml +++ b/src/main/res/values-sr/google_playstore_strings.xml @@ -27,7 +27,7 @@ --> - 3 + 3 Оунклауд СМС синхронизује ваше локалне СМС поруке на ваш Оунклауд налог diff --git a/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml similarity index 100% rename from res/values-sr/strings.xml rename to src/main/res/values-sr/strings.xml diff --git a/res/values-sv/google_playstore_strings.xml b/src/main/res/values-sv/google_playstore_strings.xml similarity index 97% rename from res/values-sv/google_playstore_strings.xml rename to src/main/res/values-sv/google_playstore_strings.xml index 69dfa93..d1acee2 100644 --- a/res/values-sv/google_playstore_strings.xml +++ b/src/main/res/values-sv/google_playstore_strings.xml @@ -28,7 +28,7 @@ --> - 4 + 4 ownCloud SMS synkroniserar dina lokala SMS till din ownCloudinstans. diff --git a/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml similarity index 100% rename from res/values-sv/strings.xml rename to src/main/res/values-sv/strings.xml diff --git a/res/values-v14/styles.xml b/src/main/res/values-v14/styles.xml similarity index 100% rename from res/values-v14/styles.xml rename to src/main/res/values-v14/styles.xml diff --git a/res/values-w820dp/dimens.xml b/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from res/values-w820dp/dimens.xml rename to src/main/res/values-w820dp/dimens.xml diff --git a/res/values/dimens.xml b/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to src/main/res/values/dimens.xml diff --git a/res/values-en/google_playstore_strings.xml b/src/main/res/values/google_playstore_strings.xml similarity index 97% rename from res/values-en/google_playstore_strings.xml rename to src/main/res/values/google_playstore_strings.xml index 3dc357e..092d465 100644 --- a/res/values-en/google_playstore_strings.xml +++ b/src/main/res/values/google_playstore_strings.xml @@ -27,7 +27,7 @@ --> - 3 + 3 ownCloud SMS synchronize your local SMS on your ownCloud instance diff --git a/res/values/strings.xml b/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to src/main/res/values/styles.xml diff --git a/res/xml/global_preferences.xml b/src/main/res/xml/global_preferences.xml similarity index 100% rename from res/xml/global_preferences.xml rename to src/main/res/xml/global_preferences.xml diff --git a/res/xml/owncloud_account_authenticator.xml b/src/main/res/xml/owncloud_account_authenticator.xml similarity index 100% rename from res/xml/owncloud_account_authenticator.xml rename to src/main/res/xml/owncloud_account_authenticator.xml diff --git a/res/xml/pref_data_sync.xml b/src/main/res/xml/pref_data_sync.xml similarity index 100% rename from res/xml/pref_data_sync.xml rename to src/main/res/xml/pref_data_sync.xml diff --git a/res/xml/slow_sync_adapter.xml b/src/main/res/xml/slow_sync_adapter.xml similarity index 100% rename from res/xml/slow_sync_adapter.xml rename to src/main/res/xml/slow_sync_adapter.xml diff --git a/res/xml/sync_adapter.xml b/src/main/res/xml/sync_adapter.xml similarity index 100% rename from res/xml/sync_adapter.xml rename to src/main/res/xml/sync_adapter.xml