Skip to content

Commit a442a63

Browse files
Merge pull request session-foundation#1953 from session-foundation/release/1.31.2
Release 1.31.2 into Master
2 parents 6e20491 + 75f6444 commit a442a63

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ configurations.configureEach {
2626
exclude(module = "commons-logging")
2727
}
2828

29-
val canonicalVersionCode = 438
30-
val canonicalVersionName = "1.31.1"
29+
val canonicalVersionCode = 439
30+
val canonicalVersionName = "1.31.2"
3131

3232
val postFixSize = 10
3333
val abiPostFix = mapOf(

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@ class MediaPreviewActivity : ScreenLockActionBarActivity(),
479479
this,
480480
ShareActivity::class.java
481481
)
482+
composeIntent.setAction(Intent.ACTION_SEND)
482483
composeIntent.putExtra(Intent.EXTRA_STREAM, mediaItem.uri)
483484
composeIntent.setType(mediaItem.mimeType)
484485
startActivity(composeIntent)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,14 @@ class ConversationActionModeCallback(
6666

6767

6868
// Delete message
69-
menu.findItem(R.id.menu_context_delete_message).isVisible = !isDeprecatedLegacyGroup // can always delete since delete logic will be handled by the VM
69+
menu.findItem(R.id.menu_context_delete_message).apply {
70+
isVisible = !isDeprecatedLegacyGroup // can always delete since delete logic will be handled by the VM
71+
72+
setTitle(
73+
context.resources.getQuantityString(R.plurals.deleteMessage,
74+
selectedItems.size, selectedItems.size)
75+
)
76+
}
7077
// Ban user
7178
val canBan = userCanBanSelectedUsers() && !isDeprecatedLegacyGroup
7279
menu.findItem(R.id.menu_context_ban_user).isVisible = canBan

app/src/main/java/org/thoughtcrime/securesms/database/RecipientSettingsDatabase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class RecipientSettingsDatabase @Inject constructor(
4343

4444
// If nothing is updated, return early
4545
if (oldSettings == newSettings) {
46-
Log.d(TAG, "No changes to settings for ${address.debugString}, old: $oldSettings, new: $newSettings")
46+
Log.d(TAG, "No changes to settings for ${address.debugString}")
4747
return
4848
}
4949

0 commit comments

Comments
 (0)