Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed filter crash

This commit is contained in:
Mariotaku Lee 2017-09-30 13:28:54 +08:00
parent 6e8ac145d9
commit baba52edaf
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twidere/src/.google.commit-id
View File

@ -1 +1 @@
a686f0886c62b44a06bb64c686768f7b63410d43
f10ce61fe9fb2c88e7d5ff50fee6e668f0053d48

7
twidere/src/main/kotlin/org/mariotaku/twidere/util/database/ContentFiltersUtils.kt
View File

@ -41,13 +41,14 @@ object ContentFiltersUtils {
private fun isFilteredQuery(users: Array<UserKey>?, texts: String?, sources: Array<String>?,
links: Array<String>?, names: Array<String>?, descriptions: String?,
filterRts: Boolean, @FilterScope scope: Int, allowedKeywords: Array<String>? = null): Pair<String, Array<String>> {
var numExpressions = 0;
val selectionArgs = mutableListOf<String>()
val queryBuilder = StringBuilder("SELECT ")
fun addExpression(ruleTable: String, ruleField: String, scopeField: String,
@FilterScope expressionScope: Int, noScopeAsTrue: Boolean, matchType: Int,
value: String, extraWhereAppend: ((StringBuilder, MutableList<String>, String) -> Unit)? = null) {
if (selectionArgs.isNotEmpty()) {
if (numExpressions > 0) {
queryBuilder.append(" OR ")
}
selectionArgs.add(value)
@ -86,7 +87,7 @@ object ContentFiltersUtils {
}
extraWhereAppend?.invoke(queryBuilder, selectionArgs, ruleField)
queryBuilder.append(")")
numExpressions += 1;
}
fun allowKeywordsWhere(sb: StringBuilder, args: MutableList<String>, ruleField: String) {
@ -130,7 +131,7 @@ object ContentFiltersUtils {
FilterScope.TARGET_DESCRIPTION or scope, false, CONTAINS,
descriptions, ::allowKeywordsWhere)
}
if (queryBuilder.isEmpty())
if (numExpressions == 0)
return Pair("SELECT 0", emptyArray())
return Pair(queryBuilder.toString(), selectionArgs.toTypedArray())
}