moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00
Code Issues Releases Wiki Activity

Hide the explicit "ring enabled" boolean behind the ringtone selection.

Browse Source
This commit is contained in:
Daniel Applebaum 2010-01-17 18:14:17 +00:00
parent f3275a8473
commit 4aca44c1aa
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -494,7 +494,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_description_label">Account name</string>
<string name="account_settings_name_label">Your name</string>
<string name="account_settings_notifications">Notifications</string>
<string name="account_settings_ring_enable">Ring</string>
<string name="account_settings_ring_summary">Ring when mail arrives</string>
<string name="account_settings_vibrate_enable">Vibrate</string>
<string name="account_settings_vibrate_summary">Vibrate when mail arrives</string>

8
res/xml/account_settings_preferences.xml
View File

@ -168,14 +168,6 @@
android:defaultValue="true"
android:summary="@string/account_settings_notify_self_summary" />
<CheckBoxPreference
android:layout="?android:attr/preferenceLayoutChild"
android:dependency="account_notify"
android:key="account_ring"
android:defaultValue="true"
android:title="@string/account_settings_ring_enable"
android:summary="@string/account_settings_ring_summary" />
<RingtonePreference
android:layout="?android:attr/preferenceLayoutChild"
android:dependency="account_notify"

28
src/com/fsck/k9/activity/setup/AccountSettings.java
View File

@ -34,7 +34,6 @@ public class AccountSettings extends K9PreferenceActivity
private static final String PREFERENCE_NOTIFY_SELF = "account_notify_self";
private static final String PREFERENCE_NOTIFY_SYNC = "account_notify_sync";
private static final String PREFERENCE_VIBRATE = "account_vibrate";
private static final String PREFERENCE_RING = "account_ring";
private static final String PREFERENCE_RINGTONE = "account_ringtone";
private static final String PREFERENCE_INCOMING = "incoming";
private static final String PREFERENCE_OUTGOING = "outgoing";
@ -59,7 +58,6 @@ public class AccountSettings extends K9PreferenceActivity
private ListPreference mAccountHideButtons;
private CheckBoxPreference mAccountNotifySync;
private CheckBoxPreference mAccountVibrate;
private CheckBoxPreference mAccountRing;
private RingtonePreference mAccountRingtone;
private ListPreference mDisplayMode;
private ListPreference mSyncMode;
@ -292,15 +290,12 @@ public class AccountSettings extends K9PreferenceActivity
// XXX: The following two lines act as a workaround for the RingtonePreference
// which does not let us set/get the value programmatically
SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences();
prefs.edit().putString(PREFERENCE_RINGTONE, mAccount.getRingtone()).commit();
String currentRingtone = (!mAccount.isRing() ? null : mAccount.getRingtone());
prefs.edit().putString(PREFERENCE_RINGTONE, currentRingtone).commit();
mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE);
mAccountVibrate.setChecked(mAccount.isVibrate());
mAccountRing = (CheckBoxPreference) findPreference(PREFERENCE_RING);
mAccountRing.setChecked(mAccount.isRing());
mAutoExpandFolder = (Preference)findPreference(PREFERENCE_AUTO_EXPAND_FOLDER);
mAutoExpandFolder.setSummary(translateFolder(mAccount.getAutoExpandFolderName()));
@ -376,7 +371,6 @@ public class AccountSettings extends K9PreferenceActivity
mAccount.setAutomaticCheckIntervalMinutes(Integer.parseInt(mCheckFrequency.getValue()));
mAccount.setDisplayCount(Integer.parseInt(mDisplayCount.getValue()));
mAccount.setVibrate(mAccountVibrate.isChecked());
mAccount.setRing(mAccountRing.isChecked());
mAccount.setFolderDisplayMode(Account.FolderMode.valueOf(mDisplayMode.getValue()));
mAccount.setFolderSyncMode(Account.FolderMode.valueOf(mSyncMode.getValue()));
mAccount.setFolderPushMode(Account.FolderMode.valueOf(mPushMode.getValue()));
@ -384,8 +378,22 @@ public class AccountSettings extends K9PreferenceActivity
mAccount.setFolderTargetMode(Account.FolderMode.valueOf(mTargetMode.getValue()));
mAccount.setDeletePolicy(Integer.parseInt(mDeletePolicy.getValue()));
mAccount.setExpungePolicy(mExpungePolicy.getValue());
SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences();
mAccount.setRingtone(prefs.getString(PREFERENCE_RINGTONE, null));
String newRingtone = prefs.getString(PREFERENCE_RINGTONE, null);
if (newRingtone != null)
{
mAccount.setRing(true);
mAccount.setRingtone(newRingtone);
}
else
{
if (mAccount.isRing())
{
mAccount.setRingtone(null);
}
}
mAccount.setHideMessageViewButtons(Account.HideButtons.valueOf(mAccountHideButtons.getValue()));
mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getSummary().toString()));
mAccount.save(Preferences.getPreferences(this));