Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed crash reported on PlayStore

Browse source
This commit is contained in:
Sylvain Berfini 2021-07-12 17:48:17 +02:00
parent 379f19067a
commit 9d4ebdb960
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -442,7 +442,7 @@ class CoreContext(val context: Context, coreConfig: Config) {
} }
fun transferCallTo(addressToCall: String) { fun transferCallTo(addressToCall: String) {
val currentCall = core.currentCall ?: core.calls.first() val currentCall = core.currentCall ?: core.calls.firstOrNull()
if (currentCall == null) { if (currentCall == null) {
Log.e("[Context] Couldn't find a call to transfer") Log.e("[Context] Couldn't find a call to transfer")
} else { } else {

12
app/src/main/java/org/linphone/utils/AppUtils.kt
View file

@ -61,14 +61,20 @@ class AppUtils {
fun getInitials(displayName: String, limit: Int = 2): String { fun getInitials(displayName: String, limit: Int = 2): String {
if (displayName.isEmpty()) return "" if (displayName.isEmpty()) return ""
val emoji = EmojiCompat.get() val split = displayName.uppercase(Locale.getDefault()).split(" ")
val split = displayName.toUpperCase(Locale.getDefault()).split(" ")
var initials = "" var initials = ""
var characters = 0 var characters = 0
val emoji = try {
EmojiCompat.get()
} catch (ise: IllegalStateException) {
Log.e("[App Utils] Can't get EmojiCompat: $ise")
null
}
for (i in split.indices) { for (i in split.indices) {
if (split[i].isNotEmpty()) { if (split[i].isNotEmpty()) {
if (emoji.hasEmojiGlyph(split[i])) { if (emoji?.hasEmojiGlyph(split[i]) == true) {
initials += emoji.process(split[i]) initials += emoji.process(split[i])
} else { } else {
initials += split[i][0] initials += split[i][0]