Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

saved messages in search

Browse source
This commit is contained in:
Dmitriy Ruban 2020-01-08 12:43:16 +02:00
parent 3fa17b5997
commit 61863cf746
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
View file

@ -155,10 +155,16 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
} }
private fun runSearch(text: String) { private fun runSearch(text: String) {
if (getString(R.string.saved_messages).startsWith(text, true)) {
val savedMessages = telegramHelper.getChat(telegramHelper.getCurrentUserId().toLong())
if (savedMessages != null) {
telegramHelper.searchChats(savedMessages.title)
}
}
telegramHelper.searchChats(text) telegramHelper.searchChats(text)
telegramHelper.searchChatsOnServer(text) telegramHelper.searchChatsOnServer(text)
telegramHelper.searchContacts(text) telegramHelper.searchContacts(text)
if (text.length > 4) { if (text.length > 4 && !getString(R.string.saved_messages).startsWith(text, true)) {
telegramHelper.searchPublicChats(text) telegramHelper.searchPublicChats(text)
} }
} }
@ -231,7 +237,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
selectedChats.forEach { selectedChats.forEach {
val chat = telegramHelper.getChat(it) val chat = telegramHelper.getChat(it)
if (chat != null) { if (chat != null) {
if (!telegramHelper.isChannel(chat) && telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) { if (!telegramHelper.isChannel(chat)) {
items.add(chat) items.add(chat)
} }
} else { } else {
@ -250,7 +256,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
searchedChatsIds.forEach { searchedChatsIds.forEach {
val chat = telegramHelper.getChat(it) val chat = telegramHelper.getChat(it)
if (chat != null && !selectedChats.contains(it)) { if (chat != null && !selectedChats.contains(it)) {
if (!telegramHelper.isChannel(chat) && telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) { if (!telegramHelper.isChannel(chat)) {
chats.add(chat) chats.add(chat)
} }
} else { } else {
@ -382,9 +388,18 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
TelegramUiHelper.setupPhoto(app, holder.icon, photoPath, placeholderId, false) TelegramUiHelper.setupPhoto(app, holder.icon, photoPath, placeholderId, false)
val currentUserId = telegramHelper.getCurrentUserId()
val title = when (item) { val title = when (item) {
is TdApi.Chat -> item.title is TdApi.Chat -> {
is TdApi.User -> TelegramUiHelper.getUserName(item) if (telegramHelper.isPrivateChat(item) && (item.type as TdApi.ChatTypePrivate).userId == currentUserId) {
getString(R.string.saved_messages)
} else {
item.title
}
}
is TdApi.User -> {
if (item.id == currentUserId) getString(R.string.saved_messages) else TelegramUiHelper.getUserName(item)
}
else -> null else -> null
} }