Merge pull request #2304 from k9mail/GH-2262_remove_language_selection (88a86a14) · Commits · e / os / Mail

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -106,7 +106,6 @@ public class K9 extends Application {
		ALWAYS, NEVER, WHEN_CHECKED_AUTO_SYNC
		}

		private static String language = "";
		private static Theme theme = Theme.LIGHT;
		private static Theme messageViewTheme = Theme.USE_GLOBAL;
		private static Theme composerTheme = Theme.USE_GLOBAL;
		@@ -473,7 +472,6 @@ public class K9 extends Application {
		editor.putString("openPgpProvider", sOpenPgpProvider);
		editor.putBoolean("openPgpSupportSignOnly", sOpenPgpSupportSignOnly);

		editor.putString("language", language);
		editor.putInt("theme", theme.ordinal());
		editor.putInt("messageViewTheme", messageViewTheme.ordinal());
		editor.putInt("messageComposeTheme", composerTheme.ordinal());
		@@ -777,8 +775,6 @@ public class K9 extends Application {
		sPgpInlineDialogCounter = storage.getInt("pgpInlineDialogCounter", 0);
		sPgpSignOnlyDialogCounter = storage.getInt("pgpSignOnlyDialogCounter", 0);

		K9.setK9Language(storage.getString("language", ""));

		int themeValue = storage.getInt("theme", Theme.LIGHT.ordinal());
		// We used to save the resource ID of the theme. So convert that to the new format if
		// necessary.
		@@ -834,14 +830,6 @@ public class K9 extends Application {
		}
		}

		public static String getK9Language() {
		return language;
		}

		public static void setK9Language(String nlanguage) {
		language = nlanguage;
		}

		/**
		* Possible values for the different theme settings.
		*

k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java

+0 −23

Original line number	Diff line number	Diff line
		package com.fsck.k9.activity;

		import java.util.Locale;

		import android.app.Activity;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.text.TextUtils;
		import android.view.GestureDetector;
		import android.view.MotionEvent;

		@@ -36,23 +31,6 @@ public class K9ActivityCommon {
		return new K9ActivityCommon(activity);
		}

		public static void setLanguage(Context context, String language) {
		Locale locale;
		if (TextUtils.isEmpty(language)) {
		locale = Locale.getDefault();
		} else if (language.length() == 5 && language.charAt(2) == '_') {
		// language is in the form: en_US
		locale = new Locale(language.substring(0, 2), language.substring(3));
		} else {
		locale = new Locale(language);
		}

		Resources resources = context.getResources();
		Configuration config = resources.getConfiguration();
		config.locale = locale;
		resources.updateConfiguration(config, resources.getDisplayMetrics());
		}


		/**
		* Base activities need to implement this interface.
		@@ -71,7 +49,6 @@ public class K9ActivityCommon {

		private K9ActivityCommon(Activity activity) {
		mActivity = activity;
		setLanguage(mActivity, K9.getK9Language());
		mActivity.setTheme(K9.getK9ThemeResourceId());
		}

k9mail/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ import com.fsck.k9.K9;
		public abstract class K9PreferenceActivity extends PreferenceActivity {
		@Override
		public void onCreate(Bundle icicle) {
		K9ActivityCommon.setLanguage(this, K9.getK9Language());
		setTheme(K9.getK9ThemeResourceId());
		super.onCreate(icicle);
		}

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

+0 −24

Original line number	Diff line number	Diff line
		@@ -2,11 +2,6 @@ package com.fsck.k9.activity.setup;


		import java.io.File;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Set;

		import android.app.Dialog;
		import android.content.Context;
		@@ -53,7 +48,6 @@ public class Prefs extends K9PreferenceActivity {
		/*
		* Keys of the preferences defined in res/xml/global_preferences.xml
		*/
		private static final String PREFERENCE_LANGUAGE = "language";
		private static final String PREFERENCE_THEME = "theme";
		private static final String PREFERENCE_MESSAGE_VIEW_THEME = "messageViewTheme";
		private static final String PREFERENCE_FIXED_MESSAGE_THEME = "fixed_message_view_theme";
		@@ -120,7 +114,6 @@ public class Prefs extends K9PreferenceActivity {
		private static final int VISIBLE_REFILE_ACTIONS_COPY = 3;
		private static final int VISIBLE_REFILE_ACTIONS_SPAM = 4;

		private ListPreference mLanguage;
		private ListPreference mTheme;
		private CheckBoxPreference mFixedMessageTheme;
		private ListPreference mMessageTheme;
		@@ -182,21 +175,6 @@ public class Prefs extends K9PreferenceActivity {

		addPreferencesFromResource(R.xml.global_preferences);

		mLanguage = (ListPreference) findPreference(PREFERENCE_LANGUAGE);
		List<CharSequence> entryVector = new ArrayList<CharSequence>(Arrays.asList(mLanguage.getEntries()));
		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))) {
		entryVector.remove(i);
		entryValueVector.remove(i);
		}
		}
		initListPreference(mLanguage, K9.getK9Language(),
		entryVector.toArray(EMPTY_CHAR_SEQUENCE_ARRAY),
		entryValueVector.toArray(EMPTY_CHAR_SEQUENCE_ARRAY));

		mTheme = setupListPreference(PREFERENCE_THEME, themeIdToName(K9.getK9Theme()));
		mFixedMessageTheme = (CheckBoxPreference) findPreference(PREFERENCE_FIXED_MESSAGE_THEME);
		mFixedMessageTheme.setChecked(K9.useFixedMessageViewTheme());
		@@ -483,8 +461,6 @@ public class Prefs extends K9PreferenceActivity {
		private void saveSettings() {
		Storage storage = Preferences.getPreferences(this).getStorage();

		K9.setK9Language(mLanguage.getValue());

		K9.setK9Theme(themeNameToId(mTheme.getValue()));
		K9.setUseFixedMessageViewTheme(mFixedMessageTheme.isChecked());
		K9.setK9MessageViewThemeSetting(themeNameToId(mMessageTheme.getValue()));

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

+0 −38

Original line number	Diff line number	Diff line
		@@ -20,14 +20,12 @@ import com.fsck.k9.K9.NotificationHideSubject;
		import com.fsck.k9.K9.NotificationQuickDelete;
		import com.fsck.k9.K9.SplitViewMode;
		import com.fsck.k9.K9.Theme;
		import com.fsck.k9.R;
		import com.fsck.k9.preferences.Settings.BooleanSetting;
		import com.fsck.k9.preferences.Settings.ColorSetting;
		import com.fsck.k9.preferences.Settings.EnumSetting;
		import com.fsck.k9.preferences.Settings.FontSizeSetting;
		import com.fsck.k9.preferences.Settings.IntegerRangeSetting;
		import com.fsck.k9.preferences.Settings.InvalidSettingValueException;
		import com.fsck.k9.preferences.Settings.PseudoEnumSetting;
		import com.fsck.k9.preferences.Settings.SettingsDescription;
		import com.fsck.k9.preferences.Settings.SettingsUpgrader;
		import com.fsck.k9.preferences.Settings.StringSetting;
		@@ -147,9 +145,6 @@ public class GlobalSettings {
		new V(1, new BooleanSetting(false)),
		new V(12, null)
		));
		s.put("language", Settings.versions(
		new V(1, new LanguageSetting())
		));
		s.put("measureAccounts", Settings.versions(
		new V(1, new BooleanSetting(true))
		));
		@@ -416,39 +411,6 @@ public class GlobalSettings {
		}
		}

		private static class LanguageSetting extends PseudoEnumSetting<String> {
		private final Map<String, String> mapping;

		LanguageSetting() {
		super("");

		Map<String, String> mapping = new HashMap<>();
		String[] values = K9.app.getResources().getStringArray(R.array.settings_language_values);
		for (String value : values) {
		if (value.length() == 0) {
		mapping.put("", "default");
		} else {
		mapping.put(value, value);
		}
		}
		this.mapping = Collections.unmodifiableMap(mapping);
		}

		@Override
		protected Map<String, String> getMapping() {
		return mapping;
		}

		@Override
		public String fromString(String value) throws InvalidSettingValueException {
		if (mapping.containsKey(value)) {
		return value;
		}

		throw new InvalidSettingValueException();
		}
		}

		static class ThemeSetting extends SettingsDescription<K9.Theme> {
		private static final String THEME_LIGHT = "light";
		private static final String THEME_DARK = "dark";