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

[FileSharing] update extension check conditions

Browse source
This commit is contained in:
Brieuc Viel 2017-08-17 10:58:22 +02:00
parent 7e5439d55a
commit c5e90cf9df
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/android/org/linphone/ChatFragment.java
View file

@ -1128,7 +1128,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
//save SipUri into bundle
onSaveInstanceState(getArguments());
String extension = LinphoneUtils.getExtensionFromFileName(fileSharedUri);
if(extension.matches(".*(.png|.jpg|.jpeg|.bmp|.gif).*")) {
if(extension != null && extension.matches(".*(.png|.jpg|.jpeg|.bmp|.gif).*")) {
sendImageMessage(fileSharedUri, 0);
}else {
sendFileSharingMessage(fileSharedUri, 0);
@ -1633,7 +1633,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
public void loadBitmap(String path, ImageView imageView) {
if (cancelPotentialWork(path, imageView)) {
if(LinphoneUtils.getExtensionFromFileName(path).matches(".*(.png|.jpg|.jpeg|.bmp|.gif).*"))
String extension = LinphoneUtils.getExtensionFromFileName(path);
if(extension != null && extension.matches(".*(.png|.jpg|.jpeg|.bmp|.gif).*"))
defaultBitmap = BitmapFactory.decodeResource(getActivity().getResources(), R.drawable.chat_picture_over);
else
defaultBitmap = BitmapFactory.decodeResource(getActivity().getResources(), R.drawable.chat_attachment_over);