Merge branch 'dev' into strings-squashed

oxen-io · Aug 26, 2024 · b908a54 · b908a54
2 parents 404fb80 + bfbe4a8
commit b908a54
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 13 deletions.
diff --git 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
@@ -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
@@ -9,7 +9,6 @@
  <dimen name="medium_font_size">15sp</dimen>
  <dimen name="large_font_size">20sp</dimen>
  <dimen name="very_large_font_size">24sp</dimen>
- <dimen name="massive_font_size">50sp</dimen>
 
  <!-- Session -->
 

diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
@@ -6,10 +6,6 @@
  <dimen name="album_3_total_height">168dp</dimen>
  <dimen name="album_3_cell_width_big">167dp</dimen>
  <dimen name="album_3_cell_size_small">83dp</dimen>
- <dimen name="album_4_total_height">252dp</dimen>
- <dimen name="album_4_cell_size">125dp</dimen>
- <dimen name="album_5_total_height">210dp</dimen>
- <dimen name="album_5_cell_size_big">125dp</dimen>
  <dimen name="album_5_cell_size_small">83dp</dimen>
  <dimen name="max_text_width">240dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml
@@ -14,10 +14,6 @@
  <dimen name="album_3_total_height">200dp</dimen>
  <dimen name="album_3_cell_width_big">199dp</dimen>
  <dimen name="album_3_cell_size_small">99dp</dimen>
- <dimen name="album_4_total_height">300dp</dimen>
- <dimen name="album_4_cell_size">149dp</dimen>
- <dimen name="album_5_total_height">250dp</dimen>
- <dimen name="album_5_cell_size_big">149dp</dimen>
  <dimen name="album_5_cell_size_small">99dp</dimen>
  <dimen name="max_text_width">300dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw480dp/dimens.xml b/app/src/main/res/values-sw480dp/dimens.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
- <dimen name="media_bubble_max_width">350dp</dimen>
- <dimen name="media_bubble_max_height">300dp</dimen>
+
 </resources>