From 6345f5202c28d58ab5eff9910fa14d4909376c34 Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Wed, 30 Aug 2017 14:12:50 +0200 Subject: [PATCH] [LinphoneUtils] quick fix getExtensionFileFromPath() to avoid crash --- src/android/org/linphone/LinphoneUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java index cc66b6edc..c66d0af71 100644 --- a/src/android/org/linphone/LinphoneUtils.java +++ b/src/android/org/linphone/LinphoneUtils.java @@ -489,7 +489,6 @@ public final class LinphoneUtils { return name; } - public static String getExtensionFromFileName(String fileName) { String extension = null; int i = fileName.lastIndexOf('.'); @@ -500,7 +499,9 @@ public final class LinphoneUtils { } public static Boolean isExtensionImage(String path){ - String extension = LinphoneUtils.getExtensionFromFileName(path).toLowerCase(); + String extension = LinphoneUtils.getExtensionFromFileName(path); + if(extension != null) + extension = extension.toLowerCase(); return (extension != null && extension.matches(".*(png|jpg|jpeg|bmp|gif).*")); } @@ -627,7 +628,6 @@ public final class LinphoneUtils { if (LinphoneAccountCreator.PhoneNumberCheck.Invalid.value() == (status & LinphoneAccountCreator.PhoneNumberCheck.Invalid.value())) return ctxt.getString(R.string.phone_number_invalid); - } return null; }