diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-11-07 21:49:01 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-11-07 21:49:01 +0100 |
| commit | 1709346db447004322e4f3cde1be44be52451b4f (patch) | |
| tree | f8adf891a0f73a4b86acd5a72b7b23f97a61ea19 | |
| parent | 414d3abca20e8b1c3c97b74efc0404f5f6a78be6 (diff) | |
handle file attachment when missing connection
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index fd9d3e209..5e2199206 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -79,6 +79,7 @@ import de.pixart.messenger.utils.ExceptionHelper; import de.pixart.messenger.utils.FileUtils; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xmpp.OnUpdateBlocklist; +import de.pixart.messenger.xmpp.XmppConnection; import de.pixart.messenger.xmpp.chatstate.ChatState; import de.pixart.messenger.xmpp.jid.InvalidJidException; import de.pixart.messenger.xmpp.jid.Jid; @@ -1739,7 +1740,8 @@ public class ConversationActivity extends XmppActivity } 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() { |