diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-04 17:53:06 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-04 17:53:06 +0100 |
| commit | e6cd92a663ba2f8ae572c901b359ce0f42db5900 (patch) | |
| tree | 01651d05d11641a6b8ff2fe11f17e01234468d4e /src/main | |
| parent | d7ac9b88cf608e9a1dd66af8149264f89ba9678d (diff) | |
added higher auto accept file sizes
also changed labeling to MiB and KiB
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 4 | ||||
| -rw-r--r-- | 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 478586b9..ae3c1834 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<Message> { 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 4acc9e62..0fc55776 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -1,39 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string-array name="resources"> - <item>Mobile</item> - <item>Phone</item> - <item>Tablet</item> - <item>Conversations</item> - <item>Android</item> - </string-array> - <string-array name="filesizes"> - <item>never</item> - <item>256 KB</item> - <item>512 KB</item> - <item>1 MB</item> - </string-array> - <string-array name="filesizes_values"> - <item>0</item> - <item>262144</item> - <item>524288</item> - <item>1048576</item> - </string-array> - <string-array name="mute_options_descriptions"> - <item>30 minutes</item> - <item>1 hour</item> - <item>2 hours</item> - <item>8 hours</item> - <item>until further notice</item> - </string-array> + <string-array name="resources"> + <item>Mobile</item> + <item>Phone</item> + <item>Tablet</item> + <item>Conversations</item> + <item>Android</item> + </string-array> + <string-array name="filesizes"> + <item>never</item> + <item>256 KiB</item> + <item>512 KiB</item> + <item>1 MiB</item> + <item>5 MiB</item> + <item>10 MiB</item> + </string-array> + <string-array name="filesizes_values"> + <item>0</item> + <item>262144</item> + <item>524288</item> + <item>1048576</item> + <item>5242880</item> + <item>10485760</item> + </string-array> + <string-array name="mute_options_descriptions"> + <item>30 minutes</item> + <item>1 hour</item> + <item>2 hours</item> + <item>8 hours</item> + <item>until further notice</item> + </string-array> - <integer-array name="mute_options_durations"> - <item>1800</item> - <item>3600</item> - <item>7200</item> - <item>28800</item> - <item>-1</item> - </integer-array> + <integer-array name="mute_options_durations"> + <item>1800</item> + <item>3600</item> + <item>7200</item> + <item>28800</item> + <item>-1</item> + </integer-array> </resources> |