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 dac322911afca0ecf0fe137d954bcc3da762ece0..417bbbec86f78e61917fdade208a3a6676cf0ca0 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 f9c02993edfe148a24a67bedcaff95fc8ea3fbe7..44108eab9fe718e7090015a45d2a0e4601b82abd 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" />