Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/src/main/java/one/mixin/android/extension/StringExtension.kt
Original file line number Diff line number Diff line change
Expand Up @@ -848,12 +848,10 @@ fun BigDecimal.currencyFormat(): String {

fun String?.isValidMao(): Boolean {
if (this.isNullOrBlank()) return false
val text = this.lowercase()
val regex = Regex("^[^\\sA-Z]{1,128}\\.mao$")
if (!regex.matches(text)) return false
val name = text.removeSuffix(".mao")
if (name.isBlank() || name.all { it.isDigit() }) return false
return true
val text = this.trimEnd('.').lowercase()
if (text.all { it.isDigit() }) return false
val regex = Regex("^[^\\sA-Z]{1,128}$")
return regex.matches(text)
}

fun String.isMao(): Boolean {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class SearchFragment : BaseFragment(R.layout.fragment_search) {

companion object {
const val TAG = "SearchFragment"
const val SEARCH_DEBOUNCE = 300L
const val SEARCH_DEBOUNCE = 500L
}

private var keyword: String? = null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,18 @@ class StringExtensionTest {
assertEquals("", s2.filterNonAscii())
}

@Test
fun isValidMaoAllowsSearchBeforeMaoSuffix() {
assertTrue("alice".isValidMao())
assertTrue("alice.".isValidMao())
assertTrue("alice.mao".isValidMao())
assertTrue("xin.mao".isValidMao())
assertFalse("123".isValidMao())
assertFalse("has space".isValidMao())
assertFalse("".isValidMao())
assertFalse(null.isValidMao())
}

@Test
fun maxLimit() {
var str =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package one.mixin.android.ui.search

import kotlin.test.Test
import kotlin.test.assertEquals

class SearchFragmentTest {
@Test
fun searchDebounceIsHalfSecond() {
assertEquals(500L, SearchFragment.SEARCH_DEBOUNCE)
}
}