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

handle file attachment when missing connection

This commit is contained in:
Daniel Gultsch 2016-11-02 15:21:26 +01:00
parent 544c5b4a21
commit 2c004857f6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -64,6 +64,7 @@ import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate;
import eu.siacs.conversations.ui.adapter.ConversationAdapter; import eu.siacs.conversations.ui.adapter.ConversationAdapter;
import eu.siacs.conversations.utils.ExceptionHelper; import eu.siacs.conversations.utils.ExceptionHelper;
import eu.siacs.conversations.xmpp.OnUpdateBlocklist; import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
import eu.siacs.conversations.xmpp.XmppConnection;
import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.xmpp.jid.InvalidJidException;
import eu.siacs.conversations.xmpp.jid.Jid; import eu.siacs.conversations.xmpp.jid.Jid;
@ -1446,7 +1447,8 @@ public class ConversationActivity extends XmppActivity
} }
private long getMaxHttpUploadSize(Conversation conversation) { private long getMaxHttpUploadSize(Conversation conversation) {
return conversation.getAccount().getXmppConnection().getFeatures().getMaxHttpUploadSize(); final XmppConnection connection = conversation.getAccount().getXmppConnection();
return connection == null ? -1 : connection.getFeatures().getMaxHttpUploadSize();
} }
private void setNeverAskForBatteryOptimizationsAgain() { private void setNeverAskForBatteryOptimizationsAgain() {