moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 13:12:25 -05:00
Code Issues Releases Wiki Activity

isVibrate -> shouldVibrate to match shouldRing

Browse Source
This commit is contained in:
Jesse Vincent 2010-11-28 20:29:09 +00:00
parent 28c126b8a5
commit b7f52a834f
4 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

@ -579,7 +579,7 @@ public class Account implements BaseAccount
editor.putString(mUuid + ".cryptoApp", mCryptoApp); editor.putString(mUuid + ".cryptoApp", mCryptoApp);
editor.putBoolean(mUuid + ".cryptoAutoSignature", mCryptoAutoSignature); editor.putBoolean(mUuid + ".cryptoAutoSignature", mCryptoAutoSignature);
editor.putBoolean(mUuid + ".vibrate", mNotificationSetting.isVibrate()); editor.putBoolean(mUuid + ".vibrate", mNotificationSetting.shouldVibrate());
editor.putInt(mUuid + ".vibratePattern", mNotificationSetting.getVibratePattern()); editor.putInt(mUuid + ".vibratePattern", mNotificationSetting.getVibratePattern());
editor.putInt(mUuid + ".vibrateTimes", mNotificationSetting.getVibrateTimes()); editor.putInt(mUuid + ".vibrateTimes", mNotificationSetting.getVibrateTimes());
editor.putBoolean(mUuid + ".ring", mNotificationSetting.shouldRing()); editor.putBoolean(mUuid + ".ring", mNotificationSetting.shouldRing());

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

@ -82,7 +82,7 @@ public class NotificationSetting
mLedColor = color; mLedColor = color;
} }
public synchronized boolean isVibrate() public synchronized boolean shouldVibrate()
{ {
return mVibrate; return mVibrate;
} }

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

@ -533,7 +533,7 @@ public class AccountSettings extends K9PreferenceActivity
prefs.edit().putString(PREFERENCE_RINGTONE, currentRingtone).commit(); prefs.edit().putString(PREFERENCE_RINGTONE, currentRingtone).commit();
mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE); mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE);
mAccountVibrate.setChecked(mAccount.getNotificationSetting().isVibrate()); mAccountVibrate.setChecked(mAccount.getNotificationSetting().shouldVibrate());
mAccountVibratePattern = (ListPreference) findPreference(PREFERENCE_VIBRATE_PATTERN); mAccountVibratePattern = (ListPreference) findPreference(PREFERENCE_VIBRATE_PATTERN);
mAccountVibratePattern.setValue(String.valueOf(mAccount.getNotificationSetting().getVibratePattern())); mAccountVibratePattern.setValue(String.valueOf(mAccount.getNotificationSetting().getVibratePattern()));

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

@ -4739,7 +4739,7 @@ public class MessagingController implements Runnable
notification.sound = TextUtils.isEmpty(ringtone) ? null : Uri.parse(ringtone); notification.sound = TextUtils.isEmpty(ringtone) ? null : Uri.parse(ringtone);
notification.audioStreamType = AudioManager.STREAM_NOTIFICATION; notification.audioStreamType = AudioManager.STREAM_NOTIFICATION;
} }
if (setting.isVibrate()) if (setting.shouldVibrate())
{ {
long[] pattern = getVibratePattern(setting.getVibratePattern(), setting.getVibrateTimes()); long[] pattern = getVibratePattern(setting.getVibratePattern(), setting.getVibrateTimes());
notification.vibrate = pattern; notification.vibrate = pattern;