flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-10-31 02:17:53 +00:00
Code Issues Releases Wiki Activity

BindObjectPref now takes resId and resolve setting directly

Browse Source
This commit is contained in:
Loic Blot 2017-06-07 00:00:43 +02:00
parent 1d45d0a318
commit 0eb1af2da8
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/fr/unix_experience/owncloud_sms/activities/OCSMSSettingsActivity.java
View File

@ -27,9 +27,11 @@ import android.preference.ListPreference;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatDelegate; import android.support.v7.app.AppCompatDelegate;
import android.util.Log; import android.util.Log;
import android.util.Pair;
import android.view.MenuItem; import android.view.MenuItem;
import java.util.List; import java.util.List;
import java.util.Vector;
import fr.unix_experience.owncloud_sms.R; import fr.unix_experience.owncloud_sms.R;
import fr.unix_experience.owncloud_sms.activities.virtual.VirtualSettingsActivity; import fr.unix_experience.owncloud_sms.activities.virtual.VirtualSettingsActivity;
@ -45,6 +47,7 @@ public class OCSMSSettingsActivity extends VirtualSettingsActivity {
private static AccountManager _accountMgr; private static AccountManager _accountMgr;
private static String _accountAuthority; private static String _accountAuthority;
private static String _accountType; private static String _accountType;
private static Vector<Pair<Integer, Boolean>> _boolSettings;
private AppCompatDelegate mDelegate; private AppCompatDelegate mDelegate;
@ -76,19 +79,30 @@ public class OCSMSSettingsActivity extends VirtualSettingsActivity {
VirtualSettingsActivity._prefsRessourceFile = R.xml.pref_data_sync; VirtualSettingsActivity._prefsRessourceFile = R.xml.pref_data_sync;
// Bind our boolean preferences // Bind our boolean preferences
VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("push_on_receive", DefaultPrefs.pushOnReceive)); VirtualSettingsActivity._boolPrefs.add(
VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("show_sync_notifications", DefaultPrefs.showSyncNotifications)); new BindObjectPref(R.string.setting_push_on_receive, DefaultPrefs.pushOnReceive));
VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_wifi", DefaultPrefs.syncWifi)); VirtualSettingsActivity._boolPrefs.add(
VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_4g", DefaultPrefs.sync4G)); new BindObjectPref(R.string.setting_show_sync_notifications, DefaultPrefs.showSyncNotifications));
VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_3g", DefaultPrefs.sync3G)); VirtualSettingsActivity._boolPrefs.add(
VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_gprs", DefaultPrefs.syncGPRS)); new BindObjectPref(R.string.setting_sync_wifi, DefaultPrefs.syncWifi));
VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_2g", DefaultPrefs.sync2G)); VirtualSettingsActivity._boolPrefs.add(
VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_others", DefaultPrefs.syncOthers)); new BindObjectPref(R.string.setting_sync_4g, DefaultPrefs.sync4G));
VirtualSettingsActivity._boolPrefs.add(
new BindObjectPref(R.string.setting_sync_3g, DefaultPrefs.sync3G));
VirtualSettingsActivity._boolPrefs.add(
new BindObjectPref(R.string.setting_sync_gprs, DefaultPrefs.syncGPRS));
VirtualSettingsActivity._boolPrefs.add(
new BindObjectPref(R.string.setting_sync_2g, DefaultPrefs.sync2G));
VirtualSettingsActivity._boolPrefs.add(
new BindObjectPref(R.string.setting_sync_others, DefaultPrefs.syncOthers));
// Bind our string preferences // Bind our string preferences
VirtualSettingsActivity._stringPrefs.add(new BindObjectPref("sync_frequency", "15")); VirtualSettingsActivity._stringPrefs.add(
VirtualSettingsActivity._stringPrefs.add(new BindObjectPref("sync_bulk_messages", "-1")); new BindObjectPref(R.string.setting_sync_frequency, "15"));
VirtualSettingsActivity._stringPrefs.add(new BindObjectPref("minimum_sync_chars", "1")); VirtualSettingsActivity._stringPrefs.add(
new BindObjectPref(R.string.setting_sync_bulk_messages, "-1"));
VirtualSettingsActivity._stringPrefs.add(
new BindObjectPref(R.string.setting_minimum_sync_chars, "1"));
// Must be at the end, after preference bind // Must be at the end, after preference bind
super.onPostCreate(savedInstanceState); super.onPostCreate(savedInstanceState);

6
src/main/java/fr/unix_experience/owncloud_sms/activities/virtual/VirtualSettingsActivity.java
View File

@ -177,9 +177,9 @@ public class VirtualSettingsActivity extends PreferenceActivity {
// The preference object, it's only a key value pair // The preference object, it's only a key value pair
protected class BindObjectPref { protected class BindObjectPref {
public String name; public String name;
public Object value; Object value;
public BindObjectPref(String prefName, Object prefVal) { public BindObjectPref(int resId, Object prefVal) {
name = prefName; name = getString(resId);
value = prefVal; value = prefVal;
} }
} }

12
src/main/res/values/strings.xml
View File

@ -153,6 +153,18 @@
<item>15</item> <item>15</item>
</string-array> </string-array>
<string name="setting_push_on_receive" translatable="false">push_on_receive</string>
<string name="setting_show_sync_notifications" translatable="false">show_sync_notifications</string>
<string name="setting_sync_wifi" translatable="false">sync_wifi</string>
<string name="setting_sync_4g" translatable="false">sync_4g</string>
<string name="setting_sync_3g" translatable="false">sync_3g</string>
<string name="setting_sync_gprs" translatable="false">sync_gprs</string>
<string name="setting_sync_2g" translatable="false">sync_2g</string>
<string name="setting_sync_others" translatable="false">sync_others</string>
<string name="setting_sync_frequency" translatable="false">sync_frequency</string>
<string name="setting_sync_bulk_messages" translatable="false">sync_bulk_messages</string>
<string name="setting_minimum_sync_chars" translatable="false">minimum_sync_chars</string>
<string name="pref_push_on_receive">Push SMS on reception</string> <string name="pref_push_on_receive">Push SMS on reception</string>
<string name="pref_sync_wifi">Synchronize in Wi-Fi</string> <string name="pref_sync_wifi">Synchronize in Wi-Fi</string>
<string name="pref_sync_4g">Synchronize in 4G</string> <string name="pref_sync_4g">Synchronize in 4G</string>