From b27d3ab7956d39ec7a7eb4a0861ad4a427811f05 Mon Sep 17 00:00:00 2001 From: Paul Akhamiogu Date: Tue, 7 Sep 2021 22:11:33 +0100 Subject: [PATCH] ref: update copy and make 1MB default MMS file limit --- .../smsmessenger/activities/SettingsActivity.kt | 4 ++-- .../simplemobiletools/smsmessenger/extensions/Context.kt | 4 ++-- .../com/simplemobiletools/smsmessenger/helpers/Config.kt | 2 +- .../simplemobiletools/smsmessenger/helpers/Constants.kt | 4 ++-- app/src/main/res/values-cs/strings.xml | 6 +++--- app/src/main/res/values-da/strings.xml | 6 +++--- app/src/main/res/values-de/strings.xml | 9 ++++++++- app/src/main/res/values-el/strings.xml | 6 +++--- app/src/main/res/values-es/strings.xml | 6 +++--- app/src/main/res/values-fi/strings.xml | 6 +++--- app/src/main/res/values-fr/strings.xml | 6 +++--- app/src/main/res/values-id/strings.xml | 6 +++--- app/src/main/res/values-it/strings.xml | 6 +++--- app/src/main/res/values-ja/strings.xml | 6 +++--- app/src/main/res/values-lt/strings.xml | 6 +++--- app/src/main/res/values-ml/strings.xml | 6 +++--- app/src/main/res/values-nl/strings.xml | 6 +++--- app/src/main/res/values-pl/strings.xml | 6 +++--- app/src/main/res/values-pt/strings.xml | 6 +++--- app/src/main/res/values-ru/strings.xml | 6 +++--- app/src/main/res/values-sk/strings.xml | 6 +++--- app/src/main/res/values-tr/strings.xml | 6 +++--- app/src/main/res/values-uk/strings.xml | 6 +++--- app/src/main/res/values-zh-rCN/strings.xml | 6 +++--- app/src/main/res/values/strings.xml | 6 +++--- 25 files changed, 75 insertions(+), 68 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt index ab012e2f..fd4ec01f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt @@ -163,8 +163,8 @@ class SettingsActivity : SimpleActivity() { RadioItem(2, getString(R.string.mms_file_size_limit_200kb), FILE_SIZE_200_KB), RadioItem(3, getString(R.string.mms_file_size_limit_300kb), FILE_SIZE_300_KB), RadioItem(4, getString(R.string.mms_file_size_limit_600kb), FILE_SIZE_600_KB), - RadioItem(5, getString(R.string.mms_file_size_limit_1000kb), FILE_SIZE_1000_KB), - RadioItem(6, getString(R.string.mms_file_size_limit_2000kb), FILE_SIZE_2000_KB), + RadioItem(5, getString(R.string.mms_file_size_limit_1mb), FILE_SIZE_1_MB), + RadioItem(6, getString(R.string.mms_file_size_limit_2mb), FILE_SIZE_2_MB), RadioItem(7, getString(R.string.mms_file_size_limit_none), FILE_SIZE_NONE), ) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt index f9e1fa1e..4b71b182 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt @@ -771,8 +771,8 @@ fun Context.getMMSFileLimitText(size: Long) = getString( FILE_SIZE_200_KB -> R.string.mms_file_size_limit_200kb FILE_SIZE_300_KB -> R.string.mms_file_size_limit_300kb FILE_SIZE_600_KB -> R.string.mms_file_size_limit_600kb - FILE_SIZE_1000_KB -> R.string.mms_file_size_limit_1000kb - FILE_SIZE_2000_KB -> R.string.mms_file_size_limit_2000kb + FILE_SIZE_1_MB -> R.string.mms_file_size_limit_1mb + FILE_SIZE_2_MB -> R.string.mms_file_size_limit_2mb else -> R.string.mms_file_size_limit_none } ) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt index c829383a..525f8881 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt @@ -27,6 +27,6 @@ class Config(context: Context) : BaseConfig(context) { set(lockScreenVisibilitySetting) = prefs.edit().putInt(LOCK_SCREEN_VISIBILITY, lockScreenVisibilitySetting).apply() var mmsFileSizeLimit: Long - get() = prefs.getLong(MMS_FILE_SIZE_LIMIT, FILE_SIZE_NONE) + get() = prefs.getLong(MMS_FILE_SIZE_LIMIT, FILE_SIZE_1_MB) set(mmsFileSizeLimit) = prefs.edit().putLong(MMS_FILE_SIZE_LIMIT, mmsFileSizeLimit).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt index 355eac22..4c57a060 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt @@ -39,8 +39,8 @@ const val FILE_SIZE_100_KB = 102_400L const val FILE_SIZE_200_KB = 204_800L const val FILE_SIZE_300_KB = 307_200L const val FILE_SIZE_600_KB = 614_400L -const val FILE_SIZE_1000_KB = 1_048_576L -const val FILE_SIZE_2000_KB = 2_097_152L +const val FILE_SIZE_1_MB = 1_048_576L +const val FILE_SIZE_2_MB = 2_097_152L fun refreshMessages() { EventBus.getDefault().post(Events.RefreshMessages()) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 9da1f106..bb0a4c76 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f8dd2ace..ac2d26b1 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3151dca1..5481ca80 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -49,7 +49,14 @@ Sender and message Sender only Enable delivery reports - + Resize sent MMS images + 100KB + 200KB + 300KB + 600KB + 1MB + 2MB + No limit Warum benötigt diese App Internetzugriff? diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 003bee2d..547c4d37 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -49,13 +49,13 @@ Αποστολέας και μήνυμα Αποστολέας μόνο Ενεργοποίηση αναφορών παράδοσης - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index eb36c284..2389eb98 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 97c8e7be..b8072c06 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1dbba893..e6ecfde4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index bb6352fc..37d9d7c3 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6b927871..ecafa2b1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -49,13 +49,13 @@ Mittente e messaggio Solo mittente Abilita conferma di consegna - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8f7600d4..75363e93 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8c6fbb3a..aef38a4a 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 7b60f354..f66da540 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 854fd90e..2e49c0e6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -49,13 +49,13 @@ Afzender en bericht Alleen afzender Bezorgingsrapporten inschakelen - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8ecee655..97d8d62c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -51,13 +51,13 @@ Nadawca i treść Tylko nadawca Włącz raporty doręczeń - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3df4f1cf..78054a60 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 94533e34..f5f6ae41 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -51,13 +51,13 @@ Отправитель и сообщение Только отправитель Использовать отчёты о доставке - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index fc755023..e47bfef1 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -51,13 +51,13 @@ Odosielateľ a správa Iba odosielateľ Povoliť správy o doručení - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 96b87af9..c5a1c270 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d092defa..a1e4696c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 43bfb5af..89cdbc30 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4508764b..8454a015 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -49,13 +49,13 @@ Sender and message Sender only Enable delivery reports - MMS image size limit + Resize sent MMS images 100KB 200KB 300KB 600KB - 1000KB - 2000KB + 1MB + 2MB No limit