diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1784513..24f07f4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,9 +1,9 @@ - + android:versionCode="16" + android:versionName="0.16.0" > + - @@ -56,6 +56,7 @@ android:authorities="@string/account_authority"> + diff --git a/res/values-en/strings.xml b/res/values-en/strings.xml index c061f38..f5877b8 100644 --- a/res/values-en/strings.xml +++ b/res/values-en/strings.xml @@ -26,13 +26,13 @@ */ --> + + Fast Sync Fast Sync frequency Secure Slow Sync Secure Slow Sync frequency - - Settings Synchronize now Synchronization diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 2e7f4f8..d0c9535 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -40,6 +40,9 @@ Données & synchronisation Fréquence de synchronisation + SMS - Méthode rapide + SMS - Méthode lente (sécurisée) + Fréquence de la synchronisation lente Préférences générales diff --git a/res/values/strings.xml b/res/values/strings.xml index e9b55a0..181fa2e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -38,9 +38,9 @@ - Fast Sync + SMS - Fast Fast Sync frequency - Secure Slow Sync + SMS - Slow and Secure Secure Slow Sync frequency Settings Synchronize now diff --git a/res/xml/pref_data_sync.xml b/res/xml/pref_data_sync.xml index ab124c6..44080de 100644 --- a/res/xml/pref_data_sync.xml +++ b/res/xml/pref_data_sync.xml @@ -9,13 +9,13 @@ android:negativeButtonText="@null" android:positiveButtonText="@null" android:title="@string/pref_title_sync_frequency" /> - + android:title="@string/pref_title_slow_sync_frequency" /> --> diff --git a/src/fr/unix_experience/owncloud_sms/activities/GeneralSettingsActivity.java b/src/fr/unix_experience/owncloud_sms/activities/GeneralSettingsActivity.java index 2e68dc0..d2f2145 100644 --- a/src/fr/unix_experience/owncloud_sms/activities/GeneralSettingsActivity.java +++ b/src/fr/unix_experience/owncloud_sms/activities/GeneralSettingsActivity.java @@ -71,7 +71,7 @@ public class GeneralSettingsActivity extends PreferenceActivity { // their values. When their values change, their summaries are updated // to reflect the new value, per the Android Design guidelines. bindPreferenceSummaryToValue(findPreference("sync_frequency")); - bindPreferenceSummaryToValue(findPreference("slow_sync_frequency")); + //bindPreferenceSummaryToValue(findPreference("slow_sync_frequency")); } /** {@inheritDoc} */ @@ -154,7 +154,7 @@ public class GeneralSettingsActivity extends PreferenceActivity { } } // Slow Sync frequency - } else if (prefKey.equals(new String("slow_sync_frequency"))) { + } /*else if (prefKey.equals(new String("slow_sync_frequency"))) { long syncFreq = Long.parseLong((String)value); // Get ownCloud SMS account list @@ -182,8 +182,7 @@ public class GeneralSettingsActivity extends PreferenceActivity { mSlowSyncAccountAuthority, b, syncFreq * 60); } } - - } + }*/ } else { // For all other preferences, set the summary to the value's // simple string representation. @@ -235,7 +234,7 @@ public class GeneralSettingsActivity extends PreferenceActivity { // updated to reflect the new value, per the Android Design // guidelines. bindPreferenceSummaryToValue(findPreference("sync_frequency")); - bindPreferenceSummaryToValue(findPreference("slow_sync_frequency")); + //bindPreferenceSummaryToValue(findPreference("slow_sync_frequency")); } } }