mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-18 20:29:10 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove host pattern.

Browse source
This commit is contained in:
David Langley 2021-08-27 16:07:34 +01:00
parent 21c2b0b2dd
commit 0dd89e650c
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
View file

@ -67,7 +67,6 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
val footerPreference = findPreference<VectorPreference>("SETTINGS_KEYWORDS_FOOTER")!!
footerPreference.isIconSpaceReserved = false
val host = this
keywordPreference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
val keywords = editKeywordPreference.keywords
val newChecked = newValue as Boolean
@ -83,7 +82,7 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
}
result.onFailure { failure ->
refreshDisplay()
host.displayErrorDialog(failure)
displayErrorDialog(failure)
}
}
false
@ -91,7 +90,7 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
editKeywordPreference.listener = object: KeywordPreference.Listener {
override fun onFocusDidChange(hasFocus: Boolean) {
host.keywordsHasFocus = true
keywordsHasFocus = true
}
override fun didAddKeyword(keyword: String) {
@ -144,7 +143,6 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
val newActions = standardAction.actions ?: return
val newRule = PushRule(actions = newActions.toJson(), pattern = keyword, enabled = enabled, ruleId = keyword)
displayLoadingView()
val host = this
lifecycleScope.launch {
val result = runCatching {
session.addPushRule(RuleKind.CONTENT, newRule)
@ -155,13 +153,12 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
}
// Already added to UI, no-op on success
result.onFailure(host::displayErrorDialog)
result.onFailure(::displayErrorDialog)
}
}
fun removeKeyword(keyword: String) {
displayLoadingView()
val host = this
lifecycleScope.launch {
val result = runCatching {
session.removePushRule(RuleKind.CONTENT, keyword)
@ -172,7 +169,7 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment
}
// Already added to UI, no-op on success
result.onFailure(host::displayErrorDialog)
result.onFailure(::displayErrorDialog)
}
}

3
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
View file

@ -56,7 +56,6 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment
val newActions = standardAction.actions
displayLoadingView()
val host = this
lifecycleScope.launch {
val result = runCatching {
session.updatePushRuleActions(kind,
@ -74,7 +73,7 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment
result.onFailure { failure ->
// Restore the previous value
refreshDisplay()
host.displayErrorDialog(failure)
displayErrorDialog(failure)
}
}
}