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

[LinphoneUtils] quick fix getExtensionFileFromPath() to avoid crash

Browse source
This commit is contained in:
Brieuc Viel 2017-08-30 14:12:50 +02:00
parent b1a041a792
commit 6345f5202c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/android/org/linphone/LinphoneUtils.java
View file

@ -489,7 +489,6 @@ public final class LinphoneUtils {
return name; return name;
} }
public static String getExtensionFromFileName(String fileName) { public static String getExtensionFromFileName(String fileName) {
String extension = null; String extension = null;
int i = fileName.lastIndexOf('.'); int i = fileName.lastIndexOf('.');
@ -500,7 +499,9 @@ public final class LinphoneUtils {
} }
public static Boolean isExtensionImage(String path){ 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).*")); return (extension != null && extension.matches(".*(png|jpg|jpeg|bmp|gif).*"));
} }
@ -627,7 +628,6 @@ public final class LinphoneUtils {
if (LinphoneAccountCreator.PhoneNumberCheck.Invalid.value() if (LinphoneAccountCreator.PhoneNumberCheck.Invalid.value()
== (status & LinphoneAccountCreator.PhoneNumberCheck.Invalid.value())) == (status & LinphoneAccountCreator.PhoneNumberCheck.Invalid.value()))
return ctxt.getString(R.string.phone_number_invalid); return ctxt.getString(R.string.phone_number_invalid);
} }
return null; return null;
} }