From f1d46766eb803823b038a0dcbf638093ef368239 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 11 Mar 2023 03:25:56 +0800 Subject: [PATCH] Use Sequences on joinToString (#3400) * Use more Sequences to reduce collection processing https://kotlinlang.org/docs/sequences.html * Use joinToString * Fix style * Revert "Use more Sequences to reduce collection processing" This reverts commit acf8071d9e62af1366b40dc6cb0ce43b4b355ec2. * Fix --- .../main/java/com/keylesspalace/tusky/network/FilterModel.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/network/FilterModel.kt b/app/src/main/java/com/keylesspalace/tusky/network/FilterModel.kt index 16a439d9..2707dbbf 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/FilterModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/network/FilterModel.kt @@ -1,6 +1,5 @@ package com.keylesspalace.tusky.network -import android.text.TextUtils import com.keylesspalace.tusky.entity.Filter import com.keylesspalace.tusky.entity.Status import com.keylesspalace.tusky.util.parseAsMastodonHtml @@ -60,9 +59,11 @@ class FilterModel @Inject constructor() { val nonExpiredFilters = filters.filter { it.expiresAt?.before(now) != true } if (nonExpiredFilters.isEmpty()) return null val tokens = nonExpiredFilters + .asSequence() .map { filterToRegexToken(it) } + .joinToString("|") - return Pattern.compile(TextUtils.join("|", tokens), Pattern.CASE_INSENSITIVE) + return Pattern.compile(tokens, Pattern.CASE_INSENSITIVE) } companion object {