From e6cd92a663ba2f8ae572c901b359ce0f42db5900 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 4 Jan 2015 17:53:06 +0100 Subject: [PATCH] added higher auto accept file sizes also changed labeling to MiB and KiB --- .../ui/adapter/MessageAdapter.java | 4 +- src/main/res/values/arrays.xml | 70 ++++++++++--------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 478586b92..ae3c1834d 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -103,9 +103,9 @@ public class MessageAdapter extends ArrayAdapter { if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.getDownloadable() != null) { ImageParams params = message.getImageParams(); if (params.size > (1.5 * 1024 * 1024)) { - filesize = params.size / (1024 * 1024)+ " MB"; + filesize = params.size / (1024 * 1024)+ " MiB"; } else if (params.size > 0) { - filesize = params.size / 1024 + " KB"; + filesize = params.size / 1024 + " KiB"; } if (message.getDownloadable() != null && message.getDownloadable().getStatus() == Downloadable.STATUS_FAILED) { error = true; diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 4acc9e620..0fc557760 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -1,39 +1,43 @@ - - Mobile - Phone - Tablet - Conversations - Android - - - never - 256 KB - 512 KB - 1 MB - - - 0 - 262144 - 524288 - 1048576 - - - 30 minutes - 1 hour - 2 hours - 8 hours - until further notice - + + Mobile + Phone + Tablet + Conversations + Android + + + never + 256 KiB + 512 KiB + 1 MiB + 5 MiB + 10 MiB + + + 0 + 262144 + 524288 + 1048576 + 5242880 + 10485760 + + + 30 minutes + 1 hour + 2 hours + 8 hours + until further notice + - - 1800 - 3600 - 7200 - 28800 - -1 - + + 1800 + 3600 + 7200 + 28800 + -1 +