diff --git a/app/build.gradle b/app/build.gradle index 324876d532..dd69ffecc8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ configurations.forEach { it.exclude module: "commons-logging" } -def canonicalVersionCode = 379 -def canonicalVersionName = "1.19.1" +def canonicalVersionCode = 380 +def canonicalVersionName = "1.19.2" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1, diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt index 3c0007ccd7..89d61e5c22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt @@ -73,7 +73,12 @@ class SaveAttachmentTask @JvmOverloads constructor(context: Context, count: Int fun saveAttachment(context: Context, attachment: Attachment): String? { val contentType = checkNotNull(MediaUtil.getCorrectedMimeType(attachment.contentType)) var fileName = attachment.fileName + + // Added for SES-2624 to prevent Android API 28 devices and lower from crashing because + // for unknown reasons it provides us with an empty filename when saving files. + // TODO: Further investigation into root cause and fix! if (fileName.isNullOrEmpty()) fileName = generateOutputFileName(contentType, attachment.date) + fileName = sanitizeOutputFileName(fileName) val outputUri: Uri = getMediaStoreContentUriForType(contentType) val mediaUri = createOutputUri(context, outputUri, contentType, fileName) diff --git a/app/src/main/res/values-small/dimens.xml b/app/src/main/res/values-small/dimens.xml index 63b56ddac7..b1da3441b0 100644 --- a/app/src/main/res/values-small/dimens.xml +++ b/app/src/main/res/values-small/dimens.xml @@ -9,7 +9,6 @@ 15sp 20sp 24sp - 50sp diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml index 65d2c52883..485456ec3e 100644 --- a/app/src/main/res/values-sw360dp/dimens.xml +++ b/app/src/main/res/values-sw360dp/dimens.xml @@ -6,10 +6,6 @@ 168dp 167dp 83dp - 252dp - 125dp - 210dp - 125dp 83dp 240dp \ No newline at end of file diff --git a/app/src/main/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml index ca8387562c..9376913d52 100644 --- a/app/src/main/res/values-sw400dp/dimens.xml +++ b/app/src/main/res/values-sw400dp/dimens.xml @@ -14,10 +14,6 @@ 200dp 199dp 99dp - 300dp - 149dp - 250dp - 149dp 99dp 300dp \ No newline at end of file diff --git a/app/src/main/res/values-sw480dp/dimens.xml b/app/src/main/res/values-sw480dp/dimens.xml index 80c9e9b466..0d2c4cc409 100644 --- a/app/src/main/res/values-sw480dp/dimens.xml +++ b/app/src/main/res/values-sw480dp/dimens.xml @@ -1,5 +1,4 @@ - 350dp - 300dp + \ No newline at end of file