From b51198cd7dadb0ebdfab6f43bd5bb26b100e91f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Thu, 23 Jan 2020 16:34:55 -0500 Subject: [PATCH] prefs: adjust max file settings Change-Id: I2ecc35559c12841dcc7451f5c5a5b71bc37efcb8 --- .../main/java/cx/ring/fragments/GeneralAccountFragment.java | 2 +- ring-android/app/src/main/res/xml/account_prefs_jami.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java index dac322911..417bbbec8 100644 --- a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java +++ b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java @@ -137,7 +137,7 @@ public class GeneralAccountFragment extends BasePreferenceFragment<GeneralAccoun } else if (size == maxSize) { return getText(R.string.account_accept_files_always); } else { - return Formatter.formatFileSize(requireContext(), size * 1024 * 1024); + return Formatter.formatFileSize(requireContext(), size * 1000 * 1000); } } diff --git a/ring-android/app/src/main/res/xml/account_prefs_jami.xml b/ring-android/app/src/main/res/xml/account_prefs_jami.xml index f9c02993e..44108eab9 100644 --- a/ring-android/app/src/main/res/xml/account_prefs_jami.xml +++ b/ring-android/app/src/main/res/xml/account_prefs_jami.xml @@ -41,12 +41,12 @@ along with this program; if not, write to the Free Software <androidx.preference.SeekBarPreference android:icon="@drawable/baseline_attach_file_24" android:key="acceptIncomingFilesMaxSize" - android:max="256" + android:max="100" android:persistent="true" android:title="@string/account_accept_files_max_size" app:defaultValue="32" app:min="0" - app:seekBarIncrement="1" + app:seekBarIncrement="2" app:updatesContinuously="true" tools:summary="@string/account_accept_files_never" /> -- GitLab