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

Remove "messageViewShowNext" methods from 'K9'

Browse source
This commit is contained in:
cketti 2019-05-22 00:32:37 +02:00
parent 516aec77e0
commit 4dedf1b795
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -232,7 +232,9 @@ object K9 : KoinComponent {
@JvmStatic @JvmStatic
var isMessageViewReturnToList = false var isMessageViewReturnToList = false
private var messageViewShowNext = false @JvmStatic
var isMessageViewShowNext = false
var isGesturesEnabled = true var isGesturesEnabled = true
@JvmStatic @JvmStatic
@ -328,15 +330,6 @@ object K9 : KoinComponent {
updateLoggingStatus() updateLoggingStatus()
} }
@JvmStatic
fun messageViewShowNext(): Boolean {
return messageViewShowNext
}
fun setMessageViewShowNext(messageViewShowNext: Boolean) {
K9.messageViewShowNext = messageViewShowNext
}
@JvmStatic @JvmStatic
fun measureAccounts(): Boolean { fun measureAccounts(): Boolean {
return measureAccounts return measureAccounts
@ -525,7 +518,7 @@ object K9 : KoinComponent {
contactNameColor = storage.getInt("registeredNameColor", -0xffff71) contactNameColor = storage.getInt("registeredNameColor", -0xffff71)
isUseMessageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false) isUseMessageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false)
isMessageViewReturnToList = storage.getBoolean("messageViewReturnToList", false) isMessageViewReturnToList = storage.getBoolean("messageViewReturnToList", false)
messageViewShowNext = storage.getBoolean("messageViewShowNext", false) isMessageViewShowNext = storage.getBoolean("messageViewShowNext", false)
wrapFolderNames = storage.getBoolean("wrapFolderNames", false) wrapFolderNames = storage.getBoolean("wrapFolderNames", false)
hideUserAgent = storage.getBoolean("hideUserAgent", false) hideUserAgent = storage.getBoolean("hideUserAgent", false)
hideTimeZone = storage.getBoolean("hideTimeZone", false) hideTimeZone = storage.getBoolean("hideTimeZone", false)
@ -645,7 +638,7 @@ object K9 : KoinComponent {
editor.putInt("registeredNameColor", contactNameColor) editor.putInt("registeredNameColor", contactNameColor)
editor.putBoolean("messageViewFixedWidthFont", isUseMessageViewFixedWidthFont) editor.putBoolean("messageViewFixedWidthFont", isUseMessageViewFixedWidthFont)
editor.putBoolean("messageViewReturnToList", isMessageViewReturnToList) editor.putBoolean("messageViewReturnToList", isMessageViewReturnToList)
editor.putBoolean("messageViewShowNext", messageViewShowNext) editor.putBoolean("messageViewShowNext", isMessageViewShowNext)
editor.putBoolean("wrapFolderNames", wrapFolderNames) editor.putBoolean("wrapFolderNames", wrapFolderNames)
editor.putBoolean("hideUserAgent", hideUserAgent) editor.putBoolean("hideUserAgent", hideUserAgent)
editor.putBoolean("hideTimeZone", hideTimeZone) editor.putBoolean("hideTimeZone", hideTimeZone)

2
app/ui/src/main/java/com/fsck/k9/activity/MessageList.java
View file

@ -175,7 +175,7 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
private MenuItem menuButtonCheckMail; private MenuItem menuButtonCheckMail;
private View actionButtonIndeterminateProgress; private View actionButtonIndeterminateProgress;
private int lastDirection = (K9.messageViewShowNext()) ? NEXT : PREVIOUS; private int lastDirection = (K9.isMessageViewShowNext()) ? NEXT : PREVIOUS;
/** /**
* {@code true} if the message list should be displayed as flat list (i.e. no threading) * {@code true} if the message list should be displayed as flat list (i.e. no threading)

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

@ -38,7 +38,7 @@ class GeneralSettingsDataStore(
"start_integrated_inbox" -> K9.isStartInUnifiedInbox "start_integrated_inbox" -> K9.isStartInUnifiedInbox
"gestures" -> K9.isGesturesEnabled "gestures" -> K9.isGesturesEnabled
"messageview_return_to_list" -> K9.isMessageViewReturnToList "messageview_return_to_list" -> K9.isMessageViewReturnToList
"messageview_show_next" -> K9.messageViewShowNext() "messageview_show_next" -> K9.isMessageViewShowNext
"quiet_time_enabled" -> K9.quietTimeEnabled "quiet_time_enabled" -> K9.quietTimeEnabled
"disable_notifications_during_quiet_time" -> !K9.isNotificationDuringQuietTimeEnabled "disable_notifications_during_quiet_time" -> !K9.isNotificationDuringQuietTimeEnabled
"privacy_hide_useragent" -> K9.hideUserAgent() "privacy_hide_useragent" -> K9.hideUserAgent()
@ -72,7 +72,7 @@ class GeneralSettingsDataStore(
"start_integrated_inbox" -> K9.isStartInUnifiedInbox = value "start_integrated_inbox" -> K9.isStartInUnifiedInbox = value
"gestures" -> K9.isGesturesEnabled = value "gestures" -> K9.isGesturesEnabled = value
"messageview_return_to_list" -> K9.isMessageViewReturnToList = value "messageview_return_to_list" -> K9.isMessageViewReturnToList = value
"messageview_show_next" -> K9.setMessageViewShowNext(value) "messageview_show_next" -> K9.isMessageViewShowNext = value
"quiet_time_enabled" -> K9.quietTimeEnabled = value "quiet_time_enabled" -> K9.quietTimeEnabled = value
"disable_notifications_during_quiet_time" -> K9.isNotificationDuringQuietTimeEnabled = !value "disable_notifications_during_quiet_time" -> K9.isNotificationDuringQuietTimeEnabled = !value
"privacy_hide_useragent" -> K9.setHideUserAgent(value) "privacy_hide_useragent" -> K9.setHideUserAgent(value)