wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused setting "Wrap long folder names"

Browse source
This commit is contained in:
cketti 2020-01-09 17:02:33 +01:00
parent 20bf3b69f3
commit e0ba03c74b
6 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/core/src/main/java/com/fsck/k9/K9.kt
View file

@ -239,9 +239,6 @@ object K9 : EarlyInit {
var quietTimeStarts: String? = null
var quietTimeEnds: String? = null
@JvmStatic
var isWrapFolderNames = false
@JvmStatic
var isHideUserAgent = false
@ -364,7 +361,6 @@ object K9 : EarlyInit {
isUseMessageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false)
isMessageViewReturnToList = storage.getBoolean("messageViewReturnToList", false)
isMessageViewShowNext = storage.getBoolean("messageViewShowNext", false)
isWrapFolderNames = storage.getBoolean("wrapFolderNames", false)
isHideUserAgent = storage.getBoolean("hideUserAgent", false)
isHideTimeZone = storage.getBoolean("hideTimeZone", false)
@ -441,7 +437,6 @@ object K9 : EarlyInit {
editor.putBoolean("messageViewFixedWidthFont", isUseMessageViewFixedWidthFont)
editor.putBoolean("messageViewReturnToList", isMessageViewReturnToList)
editor.putBoolean("messageViewShowNext", isMessageViewShowNext)
editor.putBoolean("wrapFolderNames", isWrapFolderNames)
editor.putBoolean("hideUserAgent", isHideUserAgent)
editor.putBoolean("hideTimeZone", isHideTimeZone)

3
app/core/src/main/java/com/fsck/k9/preferences/GlobalSettings.java
View file

@ -195,9 +195,6 @@ public class GlobalSettings {
s.put("useVolumeKeysForNavigation", Settings.versions(
new V(1, new BooleanSetting(false))
));
s.put("wrapFolderNames", Settings.versions(
new V(22, new BooleanSetting(false))
));
s.put("notificationHideSubject", Settings.versions(
new V(12, new EnumSetting<>(NotificationHideSubject.class, NotificationHideSubject.NEVER))
));

2
app/core/src/main/java/com/fsck/k9/preferences/Settings.java
View file

@ -36,7 +36,7 @@ public class Settings {
*
* @see SettingsExporter
*/
public static final int VERSION = 63;
public static final int VERSION = 64;
static Map<String, Object> validate(int version, Map<String, TreeMap<Integer, SettingsDescription>> settings,
Map<String, String> importedSettings, boolean useDefaultValues) {

2
app/ui/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt
View file

@ -23,7 +23,6 @@ class GeneralSettingsDataStore(
"fixed_message_view_theme" -> K9.isFixedMessageViewTheme
"animations" -> K9.isShowAnimations
"hide_special_accounts" -> K9.isHideSpecialAccounts
"folderlist_wrap_folder_name" -> K9.isWrapFolderNames
"messagelist_stars" -> K9.isShowMessageListStars
"messagelist_show_correspondent_names" -> K9.isShowCorrespondentNames
"messagelist_sender_above_subject" -> K9.isMessageListSenderAboveSubject
@ -53,7 +52,6 @@ class GeneralSettingsDataStore(
"fixed_message_view_theme" -> K9.isFixedMessageViewTheme = value
"animations" -> K9.isShowAnimations = value
"hide_special_accounts" -> K9.isHideSpecialAccounts = value
"folderlist_wrap_folder_name" -> K9.isWrapFolderNames = value
"messagelist_stars" -> K9.isShowMessageListStars = value
"messagelist_show_correspondent_names" -> K9.isShowCorrespondentNames = value
"messagelist_sender_above_subject" -> K9.isMessageListSenderAboveSubject = value

3
app/ui/src/main/res/values/strings.xml
View file

@ -292,8 +292,6 @@ Please submit bug reports, contribute new features and ask questions at
<string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>
<string name="global_settings_registered_name_color_label">Colorize contacts</string>
<string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>
<string name="global_settings_folderlist_wrap_folder_names_label">Wrap long folder names</string>
<string name="global_settings_folderlist_wrap_folder_names_summary">Use multiple lines to show long folder names</string>
<string name="global_settings_messageview_fixedwidth_label">Fixed-width fonts</string>
<string name="global_settings_messageview_fixedwidth_summary">Use a fixed-width font when showing plain-text messages</string>
@ -789,7 +787,6 @@ Please submit bug reports, contribute new features and ask questions at
<string name="accountlist_preferences">Account list</string>
<string name="messagelist_preferences">Message lists</string>
<string name="messageview_preferences">Messages</string>
<string name="folderlist_preferences">Folder lists</string>
<string name="settings_theme_label">Theme</string>
<string name="settings_message_theme_label">Message view theme</string>
<string name="settings_compose_theme_label">Composer theme</string>

11
app/ui/src/main/res/xml/general_settings.xml
View file

@ -90,17 +90,6 @@
</PreferenceCategory>
<PreferenceCategory
android:key="folderlist_preferences"
android:title="@string/folderlist_preferences">
<CheckBoxPreference
android:key="folderlist_wrap_folder_name"
android:summary="@string/global_settings_folderlist_wrap_folder_names_summary"
android:title="@string/global_settings_folderlist_wrap_folder_names_label" />
</PreferenceCategory>
<PreferenceCategory
android:key="messagelist_preferences"
android:title="@string/messagelist_preferences">