Merge pull request #1968 (d0c13766) · Commits · e / os / Mail

k9mail/src/main/java/com/fsck/k9/K9.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ public class K9 extends Application {
		private static boolean mConfirmDeleteStarred = false;
		private static boolean mConfirmSpam = false;
		private static boolean mConfirmDeleteFromNotification = true;
		private static boolean mConfirmMarkAllRead = true;

		private static NotificationHideSubject sNotificationHideSubject = NotificationHideSubject.NEVER;

		@@ -475,6 +476,7 @@ public class K9 extends Application {
		editor.putBoolean("confirmDeleteStarred", mConfirmDeleteStarred);
		editor.putBoolean("confirmSpam", mConfirmSpam);
		editor.putBoolean("confirmDeleteFromNotification", mConfirmDeleteFromNotification);
		editor.putBoolean("confirmMarkAllRead", mConfirmMarkAllRead);

		editor.putString("sortTypeEnum", mSortType.name());
		editor.putBoolean("sortAscending", mSortAscending.get(mSortType));
		@@ -686,6 +688,7 @@ public class K9 extends Application {
		mConfirmDeleteStarred = storage.getBoolean("confirmDeleteStarred", false);
		mConfirmSpam = storage.getBoolean("confirmSpam", false);
		mConfirmDeleteFromNotification = storage.getBoolean("confirmDeleteFromNotification", true);
		mConfirmMarkAllRead = storage.getBoolean("confirmMarkAllRead", true);

		try {
		String value = storage.getString("sortTypeEnum", Account.DEFAULT_SORT_TYPE.name());
		@@ -1172,6 +1175,14 @@ public class K9 extends Application {
		mConfirmDeleteFromNotification = confirm;
		}

		public static boolean confirmMarkAllRead() {
		return mConfirmMarkAllRead;
		}

		public static void setConfirmMarkAllRead(final boolean confirm) {
		mConfirmMarkAllRead = confirm;
		}

		public static NotificationHideSubject getNotificationHideSubject() {
		return sNotificationHideSubject;
		}

k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -214,8 +214,8 @@ public class Prefs extends K9PreferenceActivity {
		mConfirmActions = (CheckBoxListPreference) findPreference(PREFERENCE_CONFIRM_ACTIONS);

		boolean canDeleteFromNotification = NotificationController.platformSupportsExtendedNotifications();
		CharSequence[] confirmActionEntries = new CharSequence[canDeleteFromNotification ? 5 : 4];
		boolean[] confirmActionValues = new boolean[canDeleteFromNotification ? 5 : 4];
		CharSequence[] confirmActionEntries = new CharSequence[canDeleteFromNotification ? 6 : 5];
		boolean[] confirmActionValues = new boolean[confirmActionEntries.length];
		int index = 0;

		confirmActionEntries[index] = getString(R.string.global_settings_confirm_action_delete);
		@@ -230,6 +230,8 @@ public class Prefs extends K9PreferenceActivity {
		confirmActionValues[index++] = K9.confirmSpam();
		confirmActionEntries[index] = getString(R.string.global_settings_confirm_menu_discard);
		confirmActionValues[index++] = K9.confirmDiscardMessage();
		confirmActionEntries[index] = getString(R.string.global_settings_confirm_menu_mark_all_read);
		confirmActionValues[index++] = K9.confirmMarkAllRead();

		mConfirmActions.setItems(confirmActionEntries);
		mConfirmActions.setCheckedItems(confirmActionValues);
		@@ -466,6 +468,7 @@ public class Prefs extends K9PreferenceActivity {
		}
		K9.setConfirmSpam(mConfirmActions.getCheckedItems()[index++]);
		K9.setConfirmDiscardMessage(mConfirmActions.getCheckedItems()[index++]);
		K9.setConfirmMarkAllRead(mConfirmActions.getCheckedItems()[index++]);

		K9.setMeasureAccounts(mMeasureAccounts.isChecked());
		K9.setCountSearchMessages(mCountSearch.isChecked());

k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -3455,7 +3455,11 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
		}

		public void confirmMarkAllAsRead() {
		if (K9.confirmMarkAllRead()) {
		showDialog(R.id.dialog_confirm_mark_all_as_read);
		} else {
		markAllAsRead();
		}
		}

		public void markAllAsRead() {

k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,9 @@ public class GlobalSettings {
		s.put("confirmSpam", Settings.versions(
		new V(1, new BooleanSetting(false))
		));
		s.put("confirmMarkAllRead", Settings.versions(
		new V(44, new BooleanSetting(true))
		));
		s.put("countSearchMessages", Settings.versions(
		new V(1, new BooleanSetting(false))
		));

k9mail/src/main/java/com/fsck/k9/preferences/Settings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ public class Settings {
		*
		* @see SettingsExporter
		*/
		public static final int VERSION = 43;
		public static final int VERSION = 44;

		public static Map<String, Object> validate(int version, Map<String,
		TreeMap<Integer, SettingsDescription>> settings,