small code cleanup (47767b9e) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/Account.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ public class Account implements BaseAccount, StoreConfig {

		private List<Identity> identities;

		private NotificationSetting notificationSetting = new NotificationSetting();
		private final NotificationSetting notificationSetting = new NotificationSetting();

		public enum FolderMode {
		NONE, ALL, FIRST_CLASS, FIRST_AND_SECOND_CLASS, NOT_SECOND_CLASS

app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt

+14 −11

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ class AccountPreferenceSerializer(

		showPictures = getEnumStringPref<ShowPictures>(storage, "$accountUuid.showPicturesEnum", ShowPictures.NEVER)

		notificationSetting.setVibrate(storage.getBoolean("$accountUuid.vibrate", false))
		notificationSetting.setVibrateEnabled(storage.getBoolean("$accountUuid.vibrate", false))
		notificationSetting.vibratePattern = storage.getInt("$accountUuid.vibratePattern", 0)
		notificationSetting.vibrateTimes = storage.getInt("$accountUuid.vibrateTimes", 5)
		notificationSetting.isRingEnabled = storage.getBoolean("$accountUuid.ring", true)
		@@ -554,18 +554,21 @@ class AccountPreferenceSerializer(

		identities = ArrayList<Identity>()

		val identity = Identity()
		identity.signatureUse = true
		identity.signature = resourceProvider.defaultSignature()
		identity.description = resourceProvider.defaultIdentityDescription()
		val identity = Identity().apply {
		signatureUse = true
		signature = resourceProvider.defaultSignature()
		description = resourceProvider.defaultIdentityDescription()
		}
		identities.add(identity)

		notificationSetting.setVibrate(false)
		notificationSetting.setVibratePattern(0)
		notificationSetting.setVibrateTimes(5)
		notificationSetting.setRingEnabled(true)
		notificationSetting.setRingtone("content://settings/system/notification_sound")
		notificationSetting.setLedColor(chipColor)
		with (notificationSetting) {
		isVibrateEnabled = false
		vibratePattern = 0
		vibrateTimes = 5
		isRingEnabled = true
		ringtone = "content://settings/system/notification_sound"
		ledColor = chipColor
		}
		}
		}

app/core/src/main/java/com/fsck/k9/NotificationSetting.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class NotificationSetting {
		return vibrateEnabled;
		}

		public synchronized void setVibrate(boolean vibrate) {
		public synchronized void setVibrateEnabled(boolean vibrate) {
		vibrateEnabled = vibrate;
		}

app/k9mail/src/main/java/com/fsck/k9/external/remotecontrol/RemoteControlService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ public class RemoteControlService extends CoreService {
		account.getNotificationSetting().setRingEnabled(Boolean.parseBoolean(ringEnabled));
		}
		if (vibrateEnabled != null) {
		account.getNotificationSetting().setVibrate(Boolean.parseBoolean(vibrateEnabled));
		account.getNotificationSetting().setVibrateEnabled(Boolean.parseBoolean(vibrateEnabled));
		}
		if (pushClasses != null) {
		needsPushRestart \|= account.setFolderPushMode(FolderMode.valueOf(pushClasses));

app/ui/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt

+8 −8

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ class AccountSettingsDataStore(
		return when (key) {
		"account_default" -> account == preferences.defaultAccount
		"mark_message_as_read_on_view" -> account.isMarkMessageAsReadOnView
		"account_sync_remote_deletetions" -> account.isSyncRemoteDeletions()
		"account_sync_remote_deletetions" -> account.isSyncRemoteDeletions
		"push_poll_on_connect" -> account.isPushPollOnConnect
		"always_show_cc_bcc" -> account.isAlwaysShowCcBcc
		"message_read_receipt" -> account.isMessageReadReceipt
		@@ -32,11 +32,11 @@ class AccountSettingsDataStore(
		"account_vibrate" -> account.notificationSetting.isVibrateEnabled
		"account_led" -> account.notificationSetting.isLedEnabled
		"account_notify_sync" -> account.isNotifySync
		"notification_opens_unread" -> account.isGoToUnreadMessageSearch()
		"remote_search_enabled" -> account.isAllowRemoteSearch()
		"notification_opens_unread" -> account.isGoToUnreadMessageSearch
		"openpgp_hide_sign_only" -> account.isOpenPgpHideSignOnly
		"openpgp_encrypt_subject" -> account.isOpenPgpEncryptSubject
		"openpgp_encrypt_all_drafts" -> account.isOpenPgpEncryptAllDrafts
		"remote_search_enabled" -> account.isAllowRemoteSearch
		"autocrypt_prefer_encrypt" -> account.autocryptPreferEncryptMutual
		"upload_sent_messages" -> account.isUploadSentMessages
		else -> defValue
		@@ -52,21 +52,21 @@ class AccountSettingsDataStore(
		return
		}
		"mark_message_as_read_on_view" -> account.isMarkMessageAsReadOnView = value
		"account_sync_remote_deletetions" -> account.setSyncRemoteDeletions(value)
		"account_sync_remote_deletetions" -> account.isSyncRemoteDeletions = value
		"push_poll_on_connect" -> account.isPushPollOnConnect = value
		"always_show_cc_bcc" -> account.isAlwaysShowCcBcc = value
		"message_read_receipt" -> account.setMessageReadReceipt(value)
		"message_read_receipt" -> account.isMessageReadReceipt = value
		"default_quoted_text_shown" -> account.isDefaultQuotedTextShown = value
		"reply_after_quote" -> account.isReplyAfterQuote = value
		"strip_signature" -> account.isStripSignature = value
		"account_notify" -> account.isNotifyNewMail = value
		"account_notify_self" -> account.isNotifySelfNewMail = value
		"account_notify_contacts_mail_only" -> account.isNotifyContactsMailOnly = value
		"account_vibrate" -> account.notificationSetting.setVibrate(value)
		"account_vibrate" -> account.notificationSetting.isVibrateEnabled = value
		"account_led" -> account.notificationSetting.setLed(value)
		"account_notify_sync" -> account.isNotifySync = value
		"notification_opens_unread" -> account.setGoToUnreadMessageSearch(value)
		"remote_search_enabled" -> account.setAllowRemoteSearch(value)
		"notification_opens_unread" -> account.isGoToUnreadMessageSearch = value
		"remote_search_enabled" -> account.isAllowRemoteSearch = value
		"openpgp_hide_sign_only" -> account.isOpenPgpHideSignOnly = value
		"openpgp_encrypt_subject" -> account.isOpenPgpEncryptSubject = value
		"openpgp_encrypt_all_drafts" -> account.isOpenPgpEncryptAllDrafts = value