sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2773 from kriztan/patch-1 

fixed crash on receiving files
This commit is contained in:
Daniel Gultsch 2018-02-02 09:33:22 +01:00 committed by GitHub
parent bcd00bb517 40878350c7
commit 9fcf8347f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/services/NotificationService.java
View File

@ -445,8 +445,8 @@ public class NotificationService {
if (addedActionsCount < 3) { if (addedActionsCount < 3) {
Message firstDownloadableMessage = getFirstDownloadableMessage(messages); Message firstDownloadableMessage = getFirstDownloadableMessage(messages);
if (firstDownloadableMessage != null) { if (firstDownloadableMessage != null) {
String label = mXmppConnectionService.getResources().getString(R.string.download_x_file, UIHelper.getFileDescriptionString(mXmppConnectionService, message)); String label = mXmppConnectionService.getResources().getString(R.string.download_x_file, UIHelper.getFileDescriptionString(mXmppConnectionService, firstDownloadableMessage));
PendingIntent pendingDownloadIntent = createDownloadIntent(message); PendingIntent pendingDownloadIntent = createDownloadIntent(firstDownloadableMessage);
NotificationCompat.Action downloadAction = new NotificationCompat.Action.Builder( NotificationCompat.Action downloadAction = new NotificationCompat.Action.Builder(
R.drawable.ic_file_download_white_24dp, R.drawable.ic_file_download_white_24dp,
label, label,