Skip to content

Commit

Permalink
Merge pull request #1644 from oxen-io/release/1.19.2
Browse files Browse the repository at this point in the history
Release/1.19.2
ThomasSession authored Aug 25, 2024
2 parents 8deb21c + a50e304 commit bfbe4a8
Showing 6 changed files with 9 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -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,
Original file line number Diff line number Diff line change
@@ -61,7 +61,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
if (fileName == null) fileName = generateOutputFileName(contentType, attachment.date)

// 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)
1 change: 0 additions & 1 deletion app/src/main/res/values-small/dimens.xml
Original file line number Diff line number Diff line change
@@ -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 -->

4 changes: 0 additions & 4 deletions app/src/main/res/values-sw360dp/dimens.xml
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 0 additions & 4 deletions app/src/main/res/values-sw400dp/dimens.xml
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 1 addition & 2 deletions app/src/main/res/values-sw480dp/dimens.xml
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit bfbe4a8

Please sign in to comment.