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

isRing -> shouldRing so that the code reads sanely

Browse Source
This commit is contained in:
Jesse Vincent 2010-07-15 03:42:01 +00:00
parent cc71273c4b
commit 08581f6538
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/fsck/k9/Account.java
View File

@ -1049,7 +1049,7 @@ public class Account implements BaseAccount
return oldMaxPushFolders != maxPushFolders; return oldMaxPushFolders != maxPushFolders;
} }
public synchronized boolean isRing() public synchronized boolean shouldRing()
{ {
return mRing; return mRing;
} }

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

@ -386,7 +386,7 @@ public class AccountSettings extends K9PreferenceActivity
// XXX: The following two lines act as a workaround for the RingtonePreference // XXX: The following two lines act as a workaround for the RingtonePreference
// which does not let us set/get the value programmatically // which does not let us set/get the value programmatically
SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences(); SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences();
String currentRingtone = (!mAccount.isRing() ? null : mAccount.getRingtone()); String currentRingtone = (!mAccount.shouldRing() ? null : mAccount.getRingtone());
prefs.edit().putString(PREFERENCE_RINGTONE, currentRingtone).commit(); prefs.edit().putString(PREFERENCE_RINGTONE, currentRingtone).commit();
mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE); mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE);
@ -565,7 +565,7 @@ public class AccountSettings extends K9PreferenceActivity
} }
else else
{ {
if (mAccount.isRing()) if (mAccount.shouldRing())
{ {
mAccount.setRingtone(null); mAccount.setRingtone(null);
} }

2
src/com/fsck/k9/controller/MessagingController.java
View File

@ -4621,7 +4621,7 @@ public class MessagingController implements Runnable
if (!account.isRingNotified()) if (!account.isRingNotified())
{ {
account.setRingNotified(true); account.setRingNotified(true);
if (account.isRing()) if (account.shouldRing())
{ {
String ringtone = account.getRingtone(); String ringtone = account.getRingtone();
notif.sound = TextUtils.isEmpty(ringtone) ? null : Uri.parse(ringtone); notif.sound = TextUtils.isEmpty(ringtone) ? null : Uri.parse(ringtone);