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

検索カラムの表示順序を調整

This commit is contained in:
tateisu 2018-08-29 01:31:18 +09:00
parent 658f228bd1
commit 3431779356
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/jp/juggler/subwaytooter/Column.kt
View File

@ -2370,6 +2370,21 @@ class Column(
list_tmp = ArrayList()
val queryAccount = search_query.trim().replace("^@".toRegex(),"")
if(queryAccount.isNotEmpty() ){
params = access_info.putMisskeyApiToken(JSONObject())
.put("query",queryAccount)
.put("localOnly",!search_resolve)
result = client.request("/api/users/search",params.toPostRequestBuilder())
val jsonArray = result?.jsonArray
if( jsonArray != null){
val src = TootParser(context,access_info).accountList(jsonArray)
list_tmp = addAll(list_tmp, src)
}
}
val queryTag = search_query.trim().replace("^#".toRegex(),"")
if(queryTag.isNotEmpty() ){
params = access_info.putMisskeyApiToken(JSONObject())
@ -2381,18 +2396,6 @@ class Column(
list_tmp = addAll(list_tmp, src)
}
}
val queryAccount = search_query.trim().replace("^@".toRegex(),"")
if(queryAccount.isNotEmpty() ){
params = access_info.putMisskeyApiToken(JSONObject())
.put("query",queryAccount)
result = client.request("/api/users/search",params.toPostRequestBuilder())
val jsonArray = result?.jsonArray
if( jsonArray != null){
val src = TootParser(context,access_info).accountList(jsonArray)
list_tmp = addAll(list_tmp, src)
}
}
if(search_query.isNotEmpty() ){
params = access_info.putMisskeyApiToken(JSONObject())
.put("query",search_query)