From 9d4ebdb9601a87f7fd2c3221b035938e84cd6bbd Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 12 Jul 2021 17:48:17 +0200 Subject: [PATCH] Fixed crash reported on PlayStore --- app/src/main/java/org/linphone/core/CoreContext.kt | 2 +- app/src/main/java/org/linphone/utils/AppUtils.kt | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt index 08848d7cd..6e1a46001 100644 --- a/app/src/main/java/org/linphone/core/CoreContext.kt +++ b/app/src/main/java/org/linphone/core/CoreContext.kt @@ -442,7 +442,7 @@ class CoreContext(val context: Context, coreConfig: Config) { } fun transferCallTo(addressToCall: String) { - val currentCall = core.currentCall ?: core.calls.first() + val currentCall = core.currentCall ?: core.calls.firstOrNull() if (currentCall == null) { Log.e("[Context] Couldn't find a call to transfer") } else { diff --git a/app/src/main/java/org/linphone/utils/AppUtils.kt b/app/src/main/java/org/linphone/utils/AppUtils.kt index 852771a1f..756936ea8 100644 --- a/app/src/main/java/org/linphone/utils/AppUtils.kt +++ b/app/src/main/java/org/linphone/utils/AppUtils.kt @@ -61,14 +61,20 @@ class AppUtils { fun getInitials(displayName: String, limit: Int = 2): String { if (displayName.isEmpty()) return "" - val emoji = EmojiCompat.get() - val split = displayName.toUpperCase(Locale.getDefault()).split(" ") + val split = displayName.uppercase(Locale.getDefault()).split(" ") var initials = "" 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) { if (split[i].isNotEmpty()) { - if (emoji.hasEmojiGlyph(split[i])) { + if (emoji?.hasEmojiGlyph(split[i]) == true) { initials += emoji.process(split[i]) } else { initials += split[i][0]