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

Added cancel for file upload and fix crash when clicking on sent picture

Browse source
This commit is contained in:
Sylvain Berfini 2015-03-17 10:46:07 +01:00
parent a60126947e
commit a2747d3734
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/org/linphone/ChatFragment.java
View file

@ -105,6 +105,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
private LinphoneCoreListenerBase mListener;
private ByteArrayOutputStream mDownloadedImageStream;
private int mDownloadedImageStreamSize;
private LinphoneChatMessage currentMessageInFileTransferUploadState;
public static boolean isInstanciated() {
return instance != null;
@ -173,9 +174,13 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
cancelUpload.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
uploadLayout.setVisibility(View.GONE);
textLayout.setVisibility(View.VISIBLE);
progressBar.setProgress(0);
if (currentMessageInFileTransferUploadState != null) {
uploadLayout.setVisibility(View.GONE);
textLayout.setVisibility(View.VISIBLE);
progressBar.setProgress(0);
currentMessageInFileTransferUploadState.cancelFileTransfer();
currentMessageInFileTransferUploadState = null;
}
}
});
@ -507,6 +512,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
textLayout.setVisibility(View.GONE);
chatRoom.sendChatMessage(message);
currentMessageInFileTransferUploadState = message;
} else {
Log.e("Error, bitmap factory can't read " + path);
}
@ -641,6 +647,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
uploadLayout.setVisibility(View.GONE);
textLayout.setVisibility(View.VISIBLE);
progressBar.setProgress(0);
currentMessageInFileTransferUploadState = null;
}
invalidate();
}

1
src/org/linphone/ui/BubbleChat.java
View file

@ -200,6 +200,7 @@ public class BubbleChat {
}
} else {
bm = BitmapFactory.decodeFile(appData);
appData = "file://" + appData;
}
if (bm != null) {