From 0aadf62cd597662493a26a1d0d522670a805578a Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 31 Mar 2019 11:15:31 +0200 Subject: rework max file upload size in server info --- .../pixart/messenger/ui/EditAccountActivity.java | 28 +--------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/EditAccountActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index 9f06bcf2a..f1f2912ae 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -1166,11 +1166,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat this.binding.serverInfoPep.setText(R.string.server_info_unavailable); } if (features.httpUpload(0)) { - if (getHttpUploadMaxFileSize().equals("0")) { - this.binding.serverInfoHttpUpload.setText(R.string.server_info_available); - } else { - this.binding.serverInfoHttpUpload.setText(getHttpUploadMaxFileSize()); - } + this.binding.serverInfoHttpUpload.setText(UIHelper.filesizeToString(features.getMaxHttpUploadSize())); } else if (features.p1S3FileTransfer()) { this.binding.serverInfoHttpUploadDescription.setText(R.string.p1_s3_filetransfer); this.binding.serverInfoHttpUpload.setText(R.string.server_info_available); @@ -1280,28 +1276,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat } } - private String getHttpUploadMaxFileSize() { - XmppConnection connection = mAccount.getXmppConnection(); - for (String namespace : new String[]{Namespace.HTTP_UPLOAD, Namespace.HTTP_UPLOAD_LEGACY}) { - List> items = connection.findDiscoItemsByFeature(namespace); - if (items.size() > 0) { - try { - long maxsize = Long.parseLong(items.get(0).getValue().getExtendedDiscoInformation(namespace, "max-file-size")); - if (maxsize > (1 * 1024 * 1024)) { - return Math.round(maxsize * 1f / (1024 * 1024)) + " MiB"; - } else if (maxsize >= (1 * 1024)) { - return Math.round(maxsize * 1f / 1024) + " KiB"; - } else if (maxsize > 0) { - return maxsize + " B"; - } - } catch (Exception e) { - return "0"; - } - } - } - return "0"; - } - private void updateDisplayName(String displayName) { if (TextUtils.isEmpty(displayName)) { this.binding.yourName.setText(R.string.no_name_set_instructions); -- cgit v1.2.3