Skip to content
Snippets Groups Projects
Commit ffcfb494 authored by Vitalii Nikitchyn's avatar Vitalii Nikitchyn Committed by Vitalii Nikitchyn
Browse files

uri check bugfix 

Change-Id: I84012f1b465e368932d61e0d63a669a98ee4d99e
parent 5cbc5ea9
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
+ 1
− 3
View file @ ffcfb494
...@@ -932,9 +932,7 @@ class AccountService( ...@@ -932,9 +932,7 @@ class AccountService(
} }
fun getConversationByUri(account: Account, conversationUri: Uri): Single<Conversation> = fun getConversationByUri(account: Account, conversationUri: Uri): Single<Conversation> =
if (conversationUri.isSwarm) if (conversationUri.isHexId) {
Single.just(account.getSwarm(conversationUri.rawRingId)!!)
else if (conversationUri.isHexId) {
val conversation = account.getByUri(conversationUri) val conversation = account.getByUri(conversationUri)
if (conversation != null) { if (conversation != null) {
Single.just(conversation) Single.just(conversation)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment