filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sc' into unifiedpush 

Change-Id: I90a603da765b718aae33b63fab92762316192038
This commit is contained in:
SpiritCroc 2021-08-20 09:47:10 +02:00
parent 1af014a527 540dd5b778
commit d290ddae95
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
increment_version.sh
View File

@ -30,13 +30,15 @@ pushd "$mydir" > /dev/null
do_translation_pull=0 do_translation_pull=0
if git remote get-url weblate > /dev/null; then if [ "$release_type" = "normal" ] && [ "$preview" != 1 ]; then
echo "Pulling translations..." if git remote get-url weblate > /dev/null; then
translation commit && do_translation_pull=1 || echo "translation tool not found, skipping forced commit" echo "Pulling translations..."
git fetch weblate translation commit && do_translation_pull=1 || echo "translation tool not found, skipping forced commit"
git merge weblate/sc --no-edit git fetch weblate
else git merge weblate/sc --no-edit
echo "WARN: remote weblate not found, not updating translations" else
echo "WARN: remote weblate not found, not updating translations"
fi
fi fi
last_tag=`downstream_latest_tag` last_tag=`downstream_latest_tag`

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
View File

@ -58,6 +58,7 @@ import org.matrix.android.sdk.internal.di.UserId
import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor
import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
import org.matrix.android.sdk.internal.session.room.send.pills.TextPillsUtils import org.matrix.android.sdk.internal.session.room.send.pills.TextPillsUtils
import java.lang.RuntimeException
import javax.inject.Inject import javax.inject.Inject
/** /**
@ -256,7 +257,11 @@ internal class LocalEchoEventFactory @Inject constructor(
private fun createVideoEvent(roomId: String, attachment: ContentAttachmentData): Event { private fun createVideoEvent(roomId: String, attachment: ContentAttachmentData): Event {
val mediaDataRetriever = MediaMetadataRetriever() val mediaDataRetriever = MediaMetadataRetriever()
mediaDataRetriever.setDataSource(context, attachment.queryUri) try {
mediaDataRetriever.setDataSource(context, attachment.queryUri)
} catch (e: RuntimeException) {
e.printStackTrace()
}
// Use frame to calculate height and width as we are sure to get the right ones // Use frame to calculate height and width as we are sure to get the right ones
val firstFrame: Bitmap? = mediaDataRetriever.frameAtTime val firstFrame: Bitmap? = mediaDataRetriever.frameAtTime

7
multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
View File

@ -23,6 +23,7 @@ import android.provider.MediaStore
import im.vector.lib.multipicker.entity.MultiPickerAudioType import im.vector.lib.multipicker.entity.MultiPickerAudioType
import im.vector.lib.multipicker.entity.MultiPickerImageType import im.vector.lib.multipicker.entity.MultiPickerImageType
import im.vector.lib.multipicker.entity.MultiPickerVideoType import im.vector.lib.multipicker.entity.MultiPickerVideoType
import java.lang.RuntimeException
internal fun Uri.toMultiPickerImageType(context: Context): MultiPickerImageType? { internal fun Uri.toMultiPickerImageType(context: Context): MultiPickerImageType? {
val projection = arrayOf( val projection = arrayOf(
@ -88,7 +89,11 @@ internal fun Uri.toMultiPickerVideoType(context: Context): MultiPickerVideoType?
context.contentResolver.openFileDescriptor(this, "r")?.use { pfd -> context.contentResolver.openFileDescriptor(this, "r")?.use { pfd ->
val mediaMetadataRetriever = MediaMetadataRetriever() val mediaMetadataRetriever = MediaMetadataRetriever()
mediaMetadataRetriever.setDataSource(pfd.fileDescriptor) try {
mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
} catch (e: RuntimeException) {
e.printStackTrace()
}
duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0 width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0 height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0