Merge pull request #1281 from session-foundation/release/1.25.2

Prepare for release 1.25.2

Author: SessionHero01

app/build.gradle.kts

@@ -24,8 +24,8 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 413
-val canonicalVersionName = "1.25.1"
+val canonicalVersionCode = 414
+val canonicalVersionName = "1.25.2"
 
 val postFixSize = 10
 val abiPostFix = mapOf(

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

@@ -10,6 +10,7 @@ import android.os.Bundle
 import androidx.annotation.IdRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.content.IntentCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.Dispatchers
@@ -226,15 +227,17 @@ abstract class ScreenLockActionBarActivity : BaseActionBarActivity() {
 
         // Clear original clipData
         rewrittenIntent.clipData = null
-
-        // If we couldn't find one then we have nothing to re-write and we'll just return the original intent
-        if (!rewrittenIntent.hasExtra(Intent.EXTRA_STREAM)) {
-            Log.i(TAG, "No stream to rewrite - returning original intent")
-            return@withContext originalIntent
-        }
+        rewrittenIntent.removeExtra(Intent.EXTRA_STREAM)
 
         // Grab and rewrite the original intent's clipData - adding it to our rewrittenIntent as we go
         val originalClipData = originalIntent.clipData
+            ?: IntentCompat.getParcelableExtra(originalIntent, Intent.EXTRA_STREAM, Uri::class.java)?.let { uri ->
+                // If the original intent has a single Uri in the Intent.EXTRA_STREAM extra, we create a ClipData
+                // with that Uri to mimic the original clipData structure.
+                ClipData.newUri(contentResolver, "Shared data", uri)
+            }
+
+
         originalClipData?.let { clipData ->
             var newClipData: ClipData? = null
             for (i in 0 until clipData.itemCount) {
@@ -267,10 +270,6 @@ abstract class ScreenLockActionBarActivity : BaseActionBarActivity() {
                 Log.i(TAG, "Adding newClipData to rewrittenIntent.")
                 rewrittenIntent.clipData = newClipData
                 rewrittenIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            } else {
-                // If no newClipData was created, clear it to prevent referencing the old inaccessible URIs
-                Log.i(TAG, "There was no newClipData - setting the clipData to null.")
-                rewrittenIntent.clipData = null
             }
         }
 

app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.kt

@@ -125,14 +125,14 @@ fun recordAudio(
 
                 try {
                     val file by lazy {
-                        File.createTempFile("audio_recording_", ".m4a", context.cacheDir)
+                        File.createTempFile("audio_recording_", ".aac", context.cacheDir)
                     }
 
                     recorder.setAudioSource(MediaRecorder.AudioSource.MIC)
                     recorder.setAudioChannels(1)
                     recorder.setAudioSamplingRate(44100)
                     recorder.setAudioEncodingBitRate(32000)
-                    recorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4)
+                    recorder.setOutputFormat(MediaRecorder.OutputFormat.AAC_ADTS)
                     recorder.setOutputFile(file)
                     recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC)
                     recorder.setOnErrorListener { _, what, extra ->

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt

@@ -5,6 +5,7 @@ import android.graphics.Canvas
 import android.util.AttributeSet
 import android.widget.RelativeLayout
 import androidx.core.view.isVisible
+import androidx.media3.common.C
 import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewVoiceMessageBinding
@@ -78,7 +79,9 @@ class VoiceMessageView @JvmOverloads constructor(
 
     override fun onPlayerStart(player: AudioSlidePlayer) {
         isPlaying = true
-        durationMS = player.duration
+        if (player.duration != C.TIME_UNSET) {
+            durationMS = player.duration
+        }
     }
 
     override fun onPlayerStop(player: AudioSlidePlayer)  { isPlaying = false }

app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java

@@ -134,8 +134,6 @@ public class AttachmentDatabase extends Database {
                                                            CAPTION, STICKER_PACK_ID, STICKER_PACK_KEY, STICKER_ID, URL,
                                                            AUDIO_DURATION};
 
-  private static final String[] PROJECTION_AUDIO_EXTRAS = new String[] {AUDIO_VISUAL_SAMPLES};
-
   public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ROW_ID + " INTEGER PRIMARY KEY, " +
     MMS_ID + " INTEGER, " + "seq" + " INTEGER DEFAULT 0, "                        +
     CONTENT_TYPE + " TEXT, " + NAME + " TEXT, " + "chset" + " INTEGER, "             +
@@ -848,7 +846,7 @@ protected void updateAttachmentThumbnail(AttachmentId attachmentId, InputStream
     try (Cursor cursor = getReadableDatabase()
       // We expect all the audio extra values to be present (not null) or reject the whole record.
       .query(TABLE_NAME,
-        PROJECTION_AUDIO_EXTRAS,
+          new String[] {AUDIO_VISUAL_SAMPLES, AUDIO_DURATION},
         PART_ID_WHERE +
         " AND " + AUDIO_VISUAL_SAMPLES + " IS NOT NULL" +
         " AND " + AUDIO_DURATION + " IS NOT NULL" +

app/src/main/java/org/thoughtcrime/securesms/util/FilenameUtils.kt

@@ -84,8 +84,6 @@ object FilenameUtils {
     @JvmStatic
     @JvmOverloads // Force creation of two versions of this method - one with and one without the mimeType param
     fun getFilenameFromUri(context: Context, uri: Uri?, mimeType: String? = null, attachment: Attachment? = null): String {
-        Exception().printStackTrace()
-
         var extractedFilename: String? = null
 
         if (uri != null) {