filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create constant for default value and so fix a bug when setting bad value for delay.

Browse Source
This commit is contained in:
Benoit Marty 2020-09-11 11:56:25 +02:00
parent b26d379d20
commit 8abff412d0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt
View File

@ -39,6 +39,9 @@ enum class BackgroundSyncMode {
FDROID_BACKGROUND_SYNC_MODE_DISABLED; FDROID_BACKGROUND_SYNC_MODE_DISABLED;
companion object { companion object {
const val DEFAULT_SYNC_DELAY_SECONDS = 60
const val DEFAULT_SYNC_TIMEOUT_SECONDS = 6
fun fromString(value: String?): BackgroundSyncMode = values().firstOrNull { it.name == value } fun fromString(value: String?): BackgroundSyncMode = values().firstOrNull { it.name == value }
?: FDROID_BACKGROUND_SYNC_MODE_DISABLED ?: FDROID_BACKGROUND_SYNC_MODE_DISABLED
} }

8
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
View File

@ -837,8 +837,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
fun backgroundSyncTimeOut(): Int { fun backgroundSyncTimeOut(): Int {
return tryThis { return tryThis {
// The xml pref is saved as a string so use getString and parse // The xml pref is saved as a string so use getString and parse
defaultPrefs.getString(SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY, "6")?.toInt() defaultPrefs.getString(SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY, null)?.toInt()
} ?: 6 } ?: BackgroundSyncMode.DEFAULT_SYNC_TIMEOUT_SECONDS
} }
fun setBackgroundSyncTimeout(timeInSecond: Int) { fun setBackgroundSyncTimeout(timeInSecond: Int) {
@ -851,8 +851,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
fun backgroundSyncDelay(): Int { fun backgroundSyncDelay(): Int {
return tryThis { return tryThis {
// The xml pref is saved as a string so use getString and parse // The xml pref is saved as a string so use getString and parse
defaultPrefs.getString(SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY, "60")?.toInt() defaultPrefs.getString(SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY, null)?.toInt()
} ?: 60 } ?: BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS
} }
fun setBackgroundSyncDelay(timeInSecond: Int) { fun setBackgroundSyncDelay(timeInSecond: Int) {

4
vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
View File

@ -88,7 +88,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
it.summary = secondsToText(vectorPreferences.backgroundSyncTimeOut()) it.summary = secondsToText(vectorPreferences.backgroundSyncTimeOut())
it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
if (newValue is String) { if (newValue is String) {
val syncTimeout = tryThis { Integer.parseInt(newValue) } ?: 6 val syncTimeout = tryThis { Integer.parseInt(newValue) } ?: BackgroundSyncMode.DEFAULT_SYNC_TIMEOUT_SECONDS
vectorPreferences.setBackgroundSyncTimeout(maxOf(0, syncTimeout)) vectorPreferences.setBackgroundSyncTimeout(maxOf(0, syncTimeout))
refreshBackgroundSyncPrefs() refreshBackgroundSyncPrefs()
} }
@ -101,7 +101,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
it.summary = secondsToText(vectorPreferences.backgroundSyncDelay()) it.summary = secondsToText(vectorPreferences.backgroundSyncDelay())
it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
if (newValue is String) { if (newValue is String) {
val syncDelay = tryThis { Integer.parseInt(newValue) } ?: 6 val syncDelay = tryThis { Integer.parseInt(newValue) } ?: BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS
vectorPreferences.setBackgroundSyncDelay(maxOf(0, syncDelay)) vectorPreferences.setBackgroundSyncDelay(maxOf(0, syncDelay))
refreshBackgroundSyncPrefs() refreshBackgroundSyncPrefs()
} }