floatingghost/husky
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix creating filters

Browse source
This commit is contained in:
Adolfo Santiago 2022-05-08 16:07:02 +02:00
parent c9b820bb78
commit 43b2e5e9bd
No known key found for this signature in database
GPG key ID: 244D6F9A317B4A65
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
husky/app/src/main/java/com/keylesspalace/tusky/FiltersActivity.kt
View file

@ -140,7 +140,7 @@ class FiltersActivity : BaseActivity() {
} }
private fun createFilter(phrase: String, wholeWord: Boolean) { private fun createFilter(phrase: String, wholeWord: Boolean) {
api.createFilter(MastodonApi.PostFilter(phrase, listOf(context), false, wholeWord, "")) api.createFilter(MastodonApi.PostFilter(phrase, listOf(context), false, wholeWord, null))
.enqueue(object : Callback<Filter> { .enqueue(object : Callback<Filter> {
override fun onResponse(call: Call<Filter>, response: Response<Filter>) { override fun onResponse(call: Call<Filter>, response: Response<Filter>) {
val filterResponse = response.body() val filterResponse = response.body()
@ -193,7 +193,7 @@ class FiltersActivity : BaseActivity() {
dialogBind.phraseWholeWord.isChecked = filter.wholeWord dialogBind.phraseWholeWord.isChecked = filter.wholeWord
val dialog = AlertDialog.Builder(this@FiltersActivity) val dialog = AlertDialog.Builder(this@FiltersActivity)
.setTitle(R.string.filter_edit_dialog_title) .setTitle(R.string.filter_edit_dialog_title)
.setView(R.layout.dialog_filter) .setView(dialogBind.root)
.setPositiveButton(R.string.filter_dialog_update_button) { _, _ -> .setPositiveButton(R.string.filter_dialog_update_button) { _, _ ->
val oldFilter = filters[itemIndex] val oldFilter = filters[itemIndex]
val newFilter = Filter( val newFilter = Filter(
@ -230,10 +230,10 @@ class FiltersActivity : BaseActivity() {
binding.filterProgressBar.show() binding.filterProgressBar.show()
api.getFilters().enqueue(object : Callback<List<Filter>> { api.getFilters().enqueue(object : Callback<List<Filter>> {
override fun onResponse(call: Call<List<Filter>>, response: Response<List<Filter>>) { override fun onResponse(call: Call<List<Filter>>, response: Response<List<Filter>>) {
val filterResponse = response.body() val filterResponse = response.body()
if(response.isSuccessful && filterResponse != null) { if(response.isSuccessful && filterResponse != null) {
filters = filterResponse.filter { filter -> filter.context.contains(context) } filters = filterResponse.filter { filter -> filter.context.contains(context) }
.toMutableList() .toMutableList()
refreshFilterDisplay() refreshFilterDisplay()