Removed 'Sender above subject' preference. (ad2797ff) · Commits · e / os / Mail

k9mail/src/main/java/io/eelo/mail/K9.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -218,7 +218,6 @@ public class K9 extends Application
		private static int messageListPreviewLines = 2;

		private static boolean showCorrespondentNames = true;
		private static boolean messageListSenderAboveSubject = false;
		private static boolean showContactName = false;
		private static boolean changeContactNameColor = false;
		private static int contactNameColor = 0xff00008f;
		@@ -490,7 +489,6 @@ public class K9 extends Application
		editor.putBoolean("startIntegratedInbox", startIntegratedInbox);
		editor.putBoolean("measureAccounts", measureAccounts);
		editor.putBoolean("countSearchMessages", countSearchMessages);
		editor.putBoolean("messageListSenderAboveSubject", messageListSenderAboveSubject);
		editor.putBoolean("hideSpecialAccounts", hideSpecialAccounts);
		editor.putBoolean("messageListStars", messageListStars);
		editor.putInt("messageListPreviewLines", messageListPreviewLines);
		@@ -746,7 +744,6 @@ public class K9 extends Application
		measureAccounts = storage.getBoolean("measureAccounts", true);
		countSearchMessages = storage.getBoolean("countSearchMessages", true);
		hideSpecialAccounts = storage.getBoolean("hideSpecialAccounts", false);
		messageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", true);
		messageListCheckboxes = storage.getBoolean("messageListCheckboxes", false);
		messageListStars = storage.getBoolean("messageListStars", true);
		messageListPreviewLines = storage.getInt("messageListPreviewLines", 1);
		@@ -1188,16 +1185,6 @@ public class K9 extends Application
		return showCorrespondentNames;
		}

		public static boolean messageListSenderAboveSubject()
		{
		return messageListSenderAboveSubject;
		}

		public static void setMessageListSenderAboveSubject(boolean sender)
		{
		messageListSenderAboveSubject = sender;
		}

		public static void setShowCorrespondentNames(boolean showCorrespondentNames)
		{
		K9.showCorrespondentNames = showCorrespondentNames;

k9mail/src/main/java/io/eelo/mail/activity/setup/Prefs.java

+189 −128

Original line number	Diff line number	Diff line
		@@ -40,10 +40,12 @@ import io.eelo.mail.preferences.StorageEditor;
		import io.eelo.mail.preferences.TimePickerPreference;
		import io.eelo.mail.service.MailService;
		import io.eelo.mail.ui.dialog.ApgDeprecationWarningDialog;

		import org.openintents.openpgp.util.OpenPgpAppPreference;


		public class Prefs extends K9PreferenceActivity {
		public class Prefs extends K9PreferenceActivity
		{

		/**
		* Immutable empty {@link CharSequence} array
		@@ -70,7 +72,6 @@ public class Prefs extends K9PreferenceActivity {
		private static final String PREFERENCE_HIDE_SPECIAL_ACCOUNTS = "hide_special_accounts";
		private static final String PREFERENCE_MESSAGELIST_CHECKBOXES = "messagelist_checkboxes";
		private static final String PREFERENCE_MESSAGELIST_PREVIEW_LINES = "messagelist_preview_lines";
		private static final String PREFERENCE_MESSAGELIST_SENDER_ABOVE_SUBJECT = "messagelist_sender_above_subject";
		private static final String PREFERENCE_MESSAGELIST_STARS = "messagelist_stars";
		private static final String PREFERENCE_MESSAGELIST_SHOW_CORRESPONDENT_NAMES = "messagelist_show_correspondent_names";
		private static final String PREFERENCE_MESSAGELIST_SHOW_CONTACT_NAME = "messagelist_show_contact_name";
		@@ -136,7 +137,6 @@ public class Prefs extends K9PreferenceActivity {
		private CheckBoxPreference mCountSearch;
		private CheckBoxPreference mHideSpecialAccounts;
		private ListPreference mPreviewLines;
		private CheckBoxPreference mSenderAboveSubject;
		private CheckBoxPreference mCheckboxes;
		private CheckBoxPreference mStars;
		private CheckBoxPreference mShowCorrespondentNames;
		@@ -173,13 +173,15 @@ public class Prefs extends K9PreferenceActivity {
		private ListPreference mSplitViewMode;


		public static void actionPrefs(Context context) {
		public static void actionPrefs(Context context)
		{
		Intent i = new Intent(context, Prefs.class);
		context.startActivity(i);
		}

		@Override
		public void onCreate(Bundle savedInstanceState) {
		public void onCreate(Bundle savedInstanceState)
		{
		super.onCreate(savedInstanceState);

		addPreferencesFromResource(R.xml.global_preferences);
		@@ -189,8 +191,10 @@ public class Prefs extends K9PreferenceActivity {
		List<CharSequence> entryValueVector = new ArrayList<CharSequence>(Arrays.asList(mLanguage.getEntryValues()));
		String supportedLanguages[] = getResources().getStringArray(R.array.supported_languages);
		Set<String> supportedLanguageSet = new HashSet<String>(Arrays.asList(supportedLanguages));
		for (int i = entryVector.size() - 1; i > -1; --i) {
		if (!supportedLanguageSet.contains(entryValueVector.get(i))) {
		for (int i = entryVector.size() - 1; i > -1; --i)
		{
		if (!supportedLanguageSet.contains(entryValueVector.get(i)))
		{
		entryVector.remove(i);
		entryValueVector.remove(i);
		}
		@@ -208,8 +212,10 @@ public class Prefs extends K9PreferenceActivity {
		themeIdToName(K9.getK9ComposerThemeSetting()));

		findPreference(PREFERENCE_FONT_SIZE).setOnPreferenceClickListener(
		new Preference.OnPreferenceClickListener() {
		public boolean onPreferenceClick(Preference preference) {
		new Preference.OnPreferenceClickListener()
		{
		public boolean onPreferenceClick(Preference preference)
		{
		onFontSizeSettings();
		return true;
		}
		@@ -239,7 +245,8 @@ public class Prefs extends K9PreferenceActivity {
		confirmActionValues[index++] = K9.confirmDelete();
		confirmActionEntries[index] = getString(R.string.global_settings_confirm_action_delete_starred);
		confirmActionValues[index++] = K9.confirmDeleteStarred();
		if (canDeleteFromNotification) {
		if (canDeleteFromNotification)
		{
		confirmActionEntries[index] = getString(R.string.global_settings_confirm_action_delete_notif);
		confirmActionValues[index++] = K9.confirmDeleteFromNotification();
		}
		@@ -269,8 +276,6 @@ public class Prefs extends K9PreferenceActivity {
		mPreviewLines = setupListPreference(PREFERENCE_MESSAGELIST_PREVIEW_LINES,
		Integer.toString(K9.messageListPreviewLines()));

		mSenderAboveSubject = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_SENDER_ABOVE_SUBJECT);
		mSenderAboveSubject.setChecked(K9.messageListSenderAboveSubject());
		mCheckboxes = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGELIST_CHECKBOXES);
		mCheckboxes.setChecked(K9.messageListCheckboxes());

		@@ -299,18 +304,26 @@ public class Prefs extends K9PreferenceActivity {
		mThreadedView = (CheckBoxPreference) findPreference(PREFERENCE_THREADED_VIEW);
		mThreadedView.setChecked(K9.isThreadedViewEnabled());

		if (K9.changeContactNameColor()) {
		if (K9.changeContactNameColor())
		{
		mChangeContactNameColor.setSummary(R.string.global_settings_registered_name_color_changed);
		} else {
		}
		else
		{
		mChangeContactNameColor.setSummary(R.string.global_settings_registered_name_color_default);
		}
		mChangeContactNameColor.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		mChangeContactNameColor.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
		{
		public boolean onPreferenceChange(Preference preference, Object newValue)
		{
		final Boolean checked = (Boolean) newValue;
		if (checked) {
		if (checked)
		{
		onChooseContactNameColor();
		mChangeContactNameColor.setSummary(R.string.global_settings_registered_name_color_changed);
		} else {
		}
		else
		{
		mChangeContactNameColor.setSummary(R.string.global_settings_registered_name_color_default);
		}
		mChangeContactNameColor.setChecked(checked);
		@@ -339,8 +352,10 @@ public class Prefs extends K9PreferenceActivity {
		mQuietTimeStarts = (TimePickerPreference) findPreference(PREFERENCE_QUIET_TIME_STARTS);
		mQuietTimeStarts.setDefaultValue(K9.getQuietTimeStarts());
		mQuietTimeStarts.setSummary(K9.getQuietTimeStarts());
		mQuietTimeStarts.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		mQuietTimeStarts.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
		{
		public boolean onPreferenceChange(Preference preference, Object newValue)
		{
		final String time = (String) newValue;
		mQuietTimeStarts.setSummary(time);
		return false;
		@@ -350,8 +365,10 @@ public class Prefs extends K9PreferenceActivity {
		mQuietTimeEnds = (TimePickerPreference) findPreference(PREFERENCE_QUIET_TIME_ENDS);
		mQuietTimeEnds.setSummary(K9.getQuietTimeEnds());
		mQuietTimeEnds.setDefaultValue(K9.getQuietTimeEnds());
		mQuietTimeEnds.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		mQuietTimeEnds.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
		{
		public boolean onPreferenceChange(Preference preference, Object newValue)
		{
		final String time = (String) newValue;
		mQuietTimeEnds.setSummary(time);
		return false;
		@@ -360,7 +377,8 @@ public class Prefs extends K9PreferenceActivity {

		mNotificationQuickDelete = setupListPreference(PREFERENCE_NOTIF_QUICK_DELETE,
		K9.getNotificationQuickDeleteBehaviour().toString());
		if (!NotificationController.platformSupportsExtendedNotifications()) {
		if (!NotificationController.platformSupportsExtendedNotifications())
		{
		PreferenceScreen prefs = (PreferenceScreen) findPreference("notification_preferences");
		prefs.removePreference(mNotificationQuickDelete);
		mNotificationQuickDelete = null;
		@@ -368,7 +386,8 @@ public class Prefs extends K9PreferenceActivity {

		mLockScreenNotificationVisibility = setupListPreference(PREFERENCE_LOCK_SCREEN_NOTIFICATION_VISIBILITY,
		K9.getLockScreenNotificationVisibility().toString());
		if (!NotificationController.platformSupportsLockScreenNotifications()) {
		if (!NotificationController.platformSupportsLockScreenNotifications())
		{
		((PreferenceScreen) findPreference("notification_preferences"))
		.removePreference(mLockScreenNotificationVisibility);
		mLockScreenNotificationVisibility = null;
		@@ -390,17 +409,23 @@ public class Prefs extends K9PreferenceActivity {

		mOpenPgpProvider = (OpenPgpAppPreference) findPreference(PREFERENCE_OPENPGP_PROVIDER);
		mOpenPgpProvider.setValue(K9.getOpenPgpProvider());
		if (OpenPgpAppPreference.isApgInstalled(getApplicationContext())) {
		if (OpenPgpAppPreference.isApgInstalled(getApplicationContext()))
		{
		mOpenPgpProvider.addLegacyProvider(
		APG_PROVIDER_PLACEHOLDER, getString(R.string.apg), R.drawable.ic_apg_small);
		}
		mOpenPgpProvider.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		mOpenPgpProvider.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
		{
		public boolean onPreferenceChange(Preference preference, Object newValue)
		{
		String value = newValue.toString();
		if (APG_PROVIDER_PLACEHOLDER.equals(value)) {
		if (APG_PROVIDER_PLACEHOLDER.equals(value))
		{
		mOpenPgpProvider.setValue("");
		showDialog(DIALOG_APG_DEPRECATION_WARNING);
		} else {
		}
		else
		{
		mOpenPgpProvider.setValue(value);
		}
		return false;
		@@ -413,9 +438,11 @@ public class Prefs extends K9PreferenceActivity {
		mAttachmentPathPreference = findPreference(PREFERENCE_ATTACHMENT_DEF_PATH);
		mAttachmentPathPreference.setSummary(K9.getAttachmentDefaultPath());
		mAttachmentPathPreference
		.setOnPreferenceClickListener(new OnPreferenceClickListener() {
		.setOnPreferenceClickListener(new OnPreferenceClickListener()
		{
		@Override
		public boolean onPreferenceClick(Preference preference) {
		public boolean onPreferenceClick(Preference preference)
		{
		FileBrowserHelper
		.getInstance()
		.showFileBrowserActivity(Prefs.this,
		@@ -425,16 +452,19 @@ public class Prefs extends K9PreferenceActivity {
		return true;
		}

		FileBrowserFailOverCallback callback = new FileBrowserFailOverCallback() {
		FileBrowserFailOverCallback callback = new FileBrowserFailOverCallback()
		{

		@Override
		public void onPathEntered(String path) {
		public void onPathEntered(String path)
		{
		mAttachmentPathPreference.setSummary(path);
		K9.setAttachmentDefaultPath(path);
		}

		@Override
		public void onCancel() {
		public void onCancel()
		{
		// canceled, do nothing
		}
		};
		@@ -466,25 +496,37 @@ public class Prefs extends K9PreferenceActivity {
		mSplitViewMode.getEntries(), mSplitViewMode.getEntryValues());
		}

		private static String themeIdToName(K9.Theme theme) {
		switch (theme) {
		case DARK: return "dark";
		case USE_GLOBAL: return "global";
		default: return "light";
		private static String themeIdToName(K9.Theme theme)
		{
		switch (theme)
		{
		case DARK:
		return "dark";
		case USE_GLOBAL:
		return "global";
		default:
		return "light";
		}
		}

		private static K9.Theme themeNameToId(String theme) {
		if (TextUtils.equals(theme, "dark")) {
		private static K9.Theme themeNameToId(String theme)
		{
		if (TextUtils.equals(theme, "dark"))
		{
		return K9.Theme.DARK;
		} else if (TextUtils.equals(theme, "global")) {
		}
		else if (TextUtils.equals(theme, "global"))
		{
		return K9.Theme.USE_GLOBAL;
		} else {
		}
		else
		{
		return K9.Theme.LIGHT;
		}
		}

		private void saveSettings() {
		private void saveSettings()
		{
		Storage storage = Preferences.getPreferences(this).getStorage();

		K9.setK9Language(mLanguage.getValue());
		@@ -504,7 +546,8 @@ public class Prefs extends K9PreferenceActivity {
		int index = 0;
		K9.setConfirmDelete(mConfirmActions.getCheckedItems()[index++]);
		K9.setConfirmDeleteStarred(mConfirmActions.getCheckedItems()[index++]);
		if (NotificationController.platformSupportsExtendedNotifications()) {
		if (NotificationController.platformSupportsExtendedNotifications())
		{
		K9.setConfirmDeleteFromNotification(mConfirmActions.getCheckedItems()[index++]);
		}
		K9.setConfirmSpam(mConfirmActions.getCheckedItems()[index++]);
		@@ -518,7 +561,6 @@ public class Prefs extends K9PreferenceActivity {
		K9.setMessageListCheckboxes(mCheckboxes.isChecked());
		K9.setMessageListStars(mStars.isChecked());
		K9.setShowCorrespondentNames(mShowCorrespondentNames.isChecked());
		K9.setMessageListSenderAboveSubject(mSenderAboveSubject.isChecked());
		K9.setShowContactName(mShowContactName.isChecked());
		K9.setShowContactPicture(mShowContactPicture.isChecked());
		K9.setColorizeMissingContactPictures(mColorizeMissingContactPictures.isChecked());
		@@ -543,12 +585,14 @@ public class Prefs extends K9PreferenceActivity {
		K9.setQuietTimeEnds(mQuietTimeEnds.getTime());
		K9.setWrapFolderNames(mWrapFolderNames.isChecked());

		if (mNotificationQuickDelete != null) {
		if (mNotificationQuickDelete != null)
		{
		K9.setNotificationQuickDeleteBehaviour(
		NotificationQuickDelete.valueOf(mNotificationQuickDelete.getValue()));
		}

		if(mLockScreenNotificationVisibility != null) {
		if (mLockScreenNotificationVisibility != null)
		{
		K9.setLockScreenNotificationVisibility(
		K9.LockScreenNotificationVisibility.valueOf(mLockScreenNotificationVisibility.getValue()));
		}
		@@ -557,7 +601,8 @@ public class Prefs extends K9PreferenceActivity {
		K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString());
		boolean needsRefresh = K9.setBackgroundOps(mBackgroundOps.getValue());

		if (!K9.isDebug() && mDebugLogging.isChecked()) {
		if (!K9.isDebug() && mDebugLogging.isChecked())
		{
		Toast.makeText(this, R.string.debug_logging_enabled, Toast.LENGTH_LONG).show();
		}
		K9.setDebug(mDebugLogging.isChecked());
		@@ -573,24 +618,30 @@ public class Prefs extends K9PreferenceActivity {
		K9.save(editor);
		editor.commit();

		if (needsRefresh) {
		if (needsRefresh)
		{
		MailService.actionReset(this, null);
		}
		}

		@Override
		protected void onPause() {
		protected void onPause()
		{
		saveSettings();
		super.onPause();
		}

		private void onFontSizeSettings() {
		private void onFontSizeSettings()
		{
		FontSizeSettings.actionEditSettings(this);
		}

		private void onChooseContactNameColor() {
		new ColorPickerDialog(this, new ColorPickerDialog.OnColorChangedListener() {
		public void colorChanged(int color) {
		private void onChooseContactNameColor()
		{
		new ColorPickerDialog(this, new ColorPickerDialog.OnColorChangedListener()
		{
		public void colorChanged(int color)
		{
		K9.setContactNameColor(color);
		}
		},
		@@ -598,14 +649,19 @@ public class Prefs extends K9PreferenceActivity {
		}

		@Override
		protected Dialog onCreateDialog(int id) {
		protected Dialog onCreateDialog(int id)
		{
		Dialog dialog = null;
		switch (id) {
		case DIALOG_APG_DEPRECATION_WARNING: {
		switch (id)
		{
		case DIALOG_APG_DEPRECATION_WARNING:
		{
		dialog = new ApgDeprecationWarningDialog(this);
		dialog.setOnCancelListener(new OnCancelListener() {
		dialog.setOnCancelListener(new OnCancelListener()
		{
		@Override
		public void onCancel(DialogInterface dialog) {
		public void onCancel(DialogInterface dialog)
		{
		mOpenPgpProvider.show();
		}
		});
		@@ -617,15 +673,20 @@ public class Prefs extends K9PreferenceActivity {
		}

		@Override
		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
		switch (requestCode) {
		protected void onActivityResult(int requestCode, int resultCode, Intent data)
		{
		switch (requestCode)
		{
		case ACTIVITY_CHOOSE_FOLDER:
		if (resultCode == RESULT_OK && data != null) {
		if (resultCode == RESULT_OK && data != null)
		{
		// obtain the filename
		Uri fileUri = data.getData();
		if (fileUri != null) {
		if (fileUri != null)
		{
		String filePath = fileUri.getPath();
		if (filePath != null) {
		if (filePath != null)
		{
		mAttachmentPathPreference.setSummary(filePath.toString());
		K9.setAttachmentDefaultPath(filePath.toString());
		}

k9mail/src/main/java/io/eelo/mail/fragment/MessageListFragment.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -197,7 +197,6 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
		private SortType sortType = SortType.SORT_DATE;
		private boolean sortAscending = true;
		private boolean sortDateAscending = false;
		boolean senderAboveSubject = false;
		boolean checkboxes = true;
		boolean stars = true;

		@@ -774,8 +773,6 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
		{
		super.onResume();

		senderAboveSubject = K9.messageListSenderAboveSubject();

		if (!loaderJustInitialized)
		{
		restartLoader();

k9mail/src/main/java/io/eelo/mail/preferences/GlobalSettings.java

+144 −73

File changed.

Preview size limit exceeded, changes collapsed.

k9mail/src/main/java/io/eelo/mail/widget/list/MessageListRemoteViewFactory.java

+65 −30

File changed.

Preview size limit exceeded, changes collapsed.