Fix crash when opening chats with foreign users

daniele-athome · daniele-athome · commit 13a8395176ac · 2020-09-08T14:31:17.000+02:00
Signed-off-by: Daniele Ricci &lt;daniele@casaricci.it&gt;
diff --git a/app/src/main/java/org/kontalk/authenticator/MyAccount.kt b/app/src/main/java/org/kontalk/authenticator/MyAccount.kt
@@ -68,7 +68,7 @@ class MyAccount (val systemAccount: Account, private val accountManager: Account
     fun isSelfJID(bareJid: BareJid): Boolean = bareJid.equals(selfJID)
 
     fun isNetworkJID(bareJid: BareJid): Boolean {
-        return serverList.first { it.network.equals(bareJid.domain.toString(), true) } != null
+        return serverList.firstOrNull { it.network.equals(bareJid.domain.toString(), true) } != null
     }
 
     fun createLocalJID(localpart: String): String {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class MyAccount (val systemAccount: Account, private val accountManager: Account`
`68`	`68`	`fun isSelfJID(bareJid: BareJid): Boolean = bareJid.equals(selfJID)`
`69`	`69`
`70`	`70`	`fun isNetworkJID(bareJid: BareJid): Boolean {`
`71`		`- return serverList.first { it.network.equals(bareJid.domain.toString(), true) } != null`
	`71`	`+ return serverList.firstOrNull { it.network.equals(bareJid.domain.toString(), true) } != null`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`fun createLocalJID(localpart: String): String {`