narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

prevent null pointer when checking http upload max size

Browse source
This commit is contained in:
Daniel Gultsch 2016-04-07 19:20:45 +02:00
parent 275d6a858c
commit 290f0a123e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -1301,10 +1301,6 @@ public class ConversationActivity extends XmppActivity
} else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_FILE || requestCode == ATTACHMENT_CHOICE_RECORD_VOICE) { } else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_FILE || requestCode == ATTACHMENT_CHOICE_RECORD_VOICE) {
final List<Uri> uris = extractUriFromIntent(data); final List<Uri> uris = extractUriFromIntent(data);
final Conversation c = getSelectedConversation(); final Conversation c = getSelectedConversation();
final long max = c.getAccount()
.getXmppConnection()
.getFeatures()
.getMaxHttpUploadSize();
final OnPresenceSelected callback = new OnPresenceSelected() { final OnPresenceSelected callback = new OnPresenceSelected() {
@Override @Override
public void onPresenceSelected() { public void onPresenceSelected() {
@ -1317,8 +1313,8 @@ public class ConversationActivity extends XmppActivity
} }
} }
}; };
if (c.getMode() == Conversation.MODE_MULTI if (c == null || c.getMode() == Conversation.MODE_MULTI
|| FileBackend.allFilesUnderSize(this, uris, max) || FileBackend.allFilesUnderSize(this, uris, getMaxHttpUploadSize(c))
|| c.getNextEncryption() == Message.ENCRYPTION_OTR) { || c.getNextEncryption() == Message.ENCRYPTION_OTR) {
callback.onPresenceSelected(); callback.onPresenceSelected();
} else { } else {
@ -1367,6 +1363,10 @@ public class ConversationActivity extends XmppActivity
} }
} }
private long getMaxHttpUploadSize(Conversation conversation) {
return conversation.getAccount().getXmppConnection().getFeatures().getMaxHttpUploadSize();
}
private void setNeverAskForBatteryOptimizationsAgain() { private void setNeverAskForBatteryOptimizationsAgain() {
getPreferences().edit().putBoolean("show_battery_optimization", false).commit(); getPreferences().edit().putBoolean("show_battery_optimization", false).commit();
} }