Merge pull request #1758 from session-foundation/fix/notification-in-conversation

Multi Share

Author: ThomasSession

app/src/main/AndroidManifest.xml

@@ -218,6 +218,17 @@
                 <data android:mimeType="text/*" />
                 <data android:mimeType="*/*" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="text/plain" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="application/*" />
+                <data android:mimeType="text/*" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
                 android:value=".service.DirectShareService" />

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

@@ -74,16 +74,6 @@ class ShareActivity : FullComposeScreenLockActivity() {
     }
 
     private fun initializeMedia() {
-        val streamExtra = intent.getParcelableExtra<Uri?>(Intent.EXTRA_STREAM)
-        var charSequenceExtra: CharSequence? = null
-        try {
-            charSequenceExtra = intent.getCharSequenceExtra(Intent.EXTRA_TEXT)
-        }
-        catch (e: Exception) {
-            // It's not necessarily an issue if there's no text extra when sharing files - but we do
-            // have to catch any failed attempt.
-        }
-
-        viewModel.initialiseMedia(streamExtra, charSequenceExtra, intent)
+        viewModel.initialiseMedia(intent)
     }
 }

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

@@ -43,14 +43,15 @@ import javax.inject.Inject
 
 @HiltViewModel
 class ShareViewModel @Inject constructor(
-    @param:ApplicationContext private val context: Context,
+    @ApplicationContext private val context: Context,
     private val avatarUtils: AvatarUtils,
     private val deprecationManager: LegacyGroupDeprecationManager,
     conversationRepository: ConversationRepository,
 ): ViewModel(){
+
     private val TAG = ShareViewModel::class.java.simpleName
 
-    private var resolvedExtra: Uri? = null
+    private var resolvedExtras: List<Uri> = emptyList()
     private var resolvedPlaintext: CharSequence? = null
     private var mimeType: String? = null
     private var isPassingAlongMedia = false
@@ -64,8 +65,8 @@ class ShareViewModel @Inject constructor(
     @OptIn(FlowPreview::class)
     val contacts: StateFlow<List<ConversationItem>> = combine(
         conversationRepository.observeConversationList(),
-         mutableSearchQuery.debounce(100L),
-         ::filterContacts
+        mutableSearchQuery.debounce(100L),
+        ::filterContacts
     ).stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
     val hasAnyConversations: StateFlow<Boolean?> =
@@ -79,8 +80,6 @@ class ShareViewModel @Inject constructor(
     private val _uiState = MutableStateFlow(UIState(false))
     val uiState: StateFlow<UIState> get() = _uiState
 
-
-
     private fun filterContacts(
         threads: List<ThreadRecord>,
         query: String,
@@ -114,10 +113,9 @@ class ShareViewModel @Inject constructor(
                     .thenByDescending { it.lastMessage?.timestamp } // then order by last message time
             ).map { thread ->
                 val recipient = thread.recipient
-
                 ConversationItem(
                     name = if(recipient.isSelf) context.getString(R.string.noteToSelf)
-                            else recipient.searchName,
+                    else recipient.searchName,
                     address = recipient.address,
                     avatarUIData = avatarUtils.getUIDataFromRecipient(recipient),
                     showProBadge = recipient.shouldShowProBadge
@@ -130,73 +128,96 @@ class ShareViewModel @Inject constructor(
     }
 
     fun onPause(): Boolean{
-        if (!isPassingAlongMedia && resolvedExtra != null) {
-            BlobUtils.getInstance().delete(context, resolvedExtra!!)
+        if (!isPassingAlongMedia && resolvedExtras.isNotEmpty()) {
+            resolvedExtras.forEach { uri ->
+                BlobUtils.getInstance().delete(context, uri)
+            }
             return true
         }
-
         return false
     }
 
-    fun initialiseMedia(streamExtra: Uri?, charSequenceExtra: CharSequence?, intent: Intent){
+    fun initialiseMedia(intent: Intent){
+        // Reset previous state
+        resolvedExtras = emptyList()
+        resolvedPlaintext = null
+        mimeType = null
         isPassingAlongMedia = false
 
-        mimeType = getMimeType(streamExtra, intent.type)
+        val action = intent.action
+        val type = intent.type
+        val incomingUris = ArrayList<Uri>()
+
+        if (Intent.ACTION_SEND == action) {
+            intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.let { incomingUris.add(it) }
+        } else if (Intent.ACTION_SEND_MULTIPLE == action) {
+            intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.let { incomingUris.addAll(it) }
+        }
+
+        var charSequenceExtra: CharSequence? = null
+        try {
+            charSequenceExtra = intent.getCharSequenceExtra(Intent.EXTRA_TEXT)
+        }
+        catch (e: Exception) {
+            // Ignore
+        }
+
+        isPassingAlongMedia = false
+        mimeType = getMimeType(incomingUris.firstOrNull(), type)
 
-        if (streamExtra != null && PartAuthority.isLocalUri(streamExtra)) {
+        if (incomingUris.isNotEmpty() && incomingUris.all { PartAuthority.isLocalUri(it) }) {
             isPassingAlongMedia = true
-            resolvedExtra = streamExtra
+            resolvedExtras = incomingUris
             handleResolvedMedia(intent)
-        } else if (charSequenceExtra != null && mimeType != null && mimeType!!.startsWith("text/")) {
+        } else if (
+            incomingUris.isEmpty() &&
+            charSequenceExtra != null &&
+            (mimeType?.startsWith("text/") == true)
+        ) {
             resolvedPlaintext = charSequenceExtra
             handleResolvedMedia(intent)
-        } else {
+        } else if (incomingUris.isNotEmpty()) {
             _uiState.update { it.copy(showLoader = true) }
-            resolveMedia(intent, streamExtra)
+            resolveMedia(intent, incomingUris)
+        } else {
+            _uiState.update { it.copy(showLoader = false) }
         }
     }
 
     private fun handleResolvedMedia(intent: Intent) {
         val address = IntentCompat.getParcelableExtra(intent, ShareActivity.EXTRA_ADDRESS, Address::class.java)
-
         if (address is Address.Conversable) {
             createConversation(address)
         } else {
             _uiState.update { it.copy(showLoader = false) }
         }
     }
 
-    private fun resolveMedia(intent: Intent, vararg uris: Uri?){
+    private fun resolveMedia(intent: Intent, uris: List<Uri>){
         viewModelScope.launch(Dispatchers.Default){
-            resolvedExtra = getUri(*uris)
+            resolvedExtras = uris.mapNotNull { processSingleUri(it) }
             handleResolvedMedia(intent)
         }
     }
 
-    private fun getUri(vararg uris: Uri?): Uri? {
+    private fun processSingleUri(uri: Uri): Uri? {
         try {
-            if (uris.size != 1 || uris[0] == null) {
-                Log.w(TAG, "Invalid URI passed to ResolveMediaTask - bailing.")
-                return null
-            } else {
-                Log.i(TAG, "Resolved URI: " + uris[0]!!.toString() + " - " + uris[0]!!.path)
-            }
+            Log.i(TAG, "Resolving URI: " + uri.toString() + " - " + uri.path)
 
-            var inputStream = if ("file" == uris[0]!!.scheme) {
-                FileInputStream(uris[0]!!.path)
+            val inputStream = if ("file" == uri.scheme) {
+                FileInputStream(uri.path)
             } else {
-                context.contentResolver.openInputStream(uris[0]!!)
+                context.contentResolver.openInputStream(uri)
             }
 
             if (inputStream == null) {
                 Log.w(TAG, "Failed to create input stream during ShareActivity - bailing.")
                 return null
             }
 
-            val cursor = context.contentResolver.query(uris[0]!!, arrayOf<String>(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE), null, null, null)
+            val cursor = context.contentResolver.query(uri, arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE), null, null, null)
             var fileName: String? = null
             var fileSize: Long? = null
-
             try {
                 if (cursor != null && cursor.moveToFirst()) {
                     try {
@@ -210,10 +231,12 @@ class ShareViewModel @Inject constructor(
                 cursor?.close()
             }
 
+            val specificMime = MediaUtil.getMimeType(context, uri) ?: mimeType ?: "application/octet-stream"
+
             return BlobUtils.getInstance()
                 .forData(inputStream, if (fileSize == null) 0 else fileSize)
-                .withMimeType(mimeType!!)
-                .withFileName(fileName!!)
+                .withMimeType(specificMime)
+                .withFileName(fileName ?: "unknown")
                 .createForMultipleSessionsOnDisk(context, BlobUtils.ErrorListener { e: IOException? -> Log.w(TAG, "Failed to write to disk.", e) })
                 .get()
         } catch (ioe: Exception) {
@@ -236,22 +259,26 @@ class ShareViewModel @Inject constructor(
         }
     }
 
-
     private fun createConversation(address: Address.Conversable) {
         val intent = ConversationActivityV2.createIntent(
             context = context,
             address = address,
         )
-
         intent.applyBaseShare()
-
         isPassingAlongMedia = true
         _uiEvents.tryEmit(ShareUIEvent.GoToScreen(intent))
     }
 
     private fun Intent.applyBaseShare() {
-        if (resolvedExtra != null) {
-            setDataAndType(resolvedExtra, mimeType)
+        if (resolvedExtras.isNotEmpty()) {
+            if (resolvedExtras.size == 1) {
+                action = Intent.ACTION_SEND
+                setDataAndType(resolvedExtras.first(), mimeType)
+            } else {
+                action = Intent.ACTION_SEND_MULTIPLE
+                type = mimeType ?: "*/*"
+                putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(resolvedExtras))
+            }
         } else if (resolvedPlaintext != null) {
             putExtra(Intent.EXTRA_TEXT, resolvedPlaintext)
             setType("text/plain")

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

@@ -545,12 +545,12 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
 
         // Check if address is null before proceeding with initialization
         if (
-                IntentCompat.getParcelableExtra(
-                    intent,
-                    ADDRESS,
-                    Address.Conversable::class.java
-                ) == null &&
-                intent.data?.getQueryParameter(ADDRESS).isNullOrEmpty()
+            IntentCompat.getParcelableExtra(
+                intent,
+                ADDRESS,
+                Address.Conversable::class.java
+            ) == null &&
+            intent.data?.getQueryParameter(ADDRESS).isNullOrEmpty()
         ) {
             Log.w(TAG, "ConversationActivityV2 launched without ADDRESS extra - Returning home")
             val intent = Intent(this, HomeActivity::class.java).apply {
@@ -909,22 +909,22 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
     // called from onCreate
     private fun setUpToolBar() {
         binding.conversationAppBar.setThemedContent {
-           val data by viewModel.appBarData.collectAsState()
-           val query by searchViewModel.searchQuery.collectAsState()
-
-           ConversationAppBar(
-               data = data,
-               onBackPressed = ::finish,
-               onCallPressed = ::callRecipient,
-               searchQuery = query ?: "",
-               onSearchQueryChanged = ::onSearchQueryUpdated,
-               onSearchQueryClear = {  onSearchQueryUpdated("") },
-               onSearchCanceled = ::onSearchClosed,
-               onAvatarPressed = {
-                   val intent = ConversationSettingsActivity.createIntent(this, address)
-                   settingsLauncher.launch(intent)
-               }
-           )
+            val data by viewModel.appBarData.collectAsState()
+            val query by searchViewModel.searchQuery.collectAsState()
+
+            ConversationAppBar(
+                data = data,
+                onBackPressed = ::finish,
+                onCallPressed = ::callRecipient,
+                searchQuery = query ?: "",
+                onSearchQueryChanged = ::onSearchQueryUpdated,
+                onSearchQueryClear = {  onSearchQueryUpdated("") },
+                onSearchCanceled = ::onSearchClosed,
+                onAvatarPressed = {
+                    val intent = ConversationSettingsActivity.createIntent(this, address)
+                    settingsLauncher.launch(intent)
+                }
+            )
         }
     }
 
@@ -948,6 +948,30 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
 
     // called from onCreate
     private fun restoreDraftIfNeeded() {
+        // Handle Multiple Streams (ACTION_SEND_MULTIPLE)
+        if (intent.action == Intent.ACTION_SEND_MULTIPLE && intent.hasExtra(Intent.EXTRA_STREAM)) {
+            val uris = intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)
+            if (!uris.isNullOrEmpty()) {
+                val mediaList = uris.mapNotNull { uri ->
+                    val mime = MediaUtil.getMimeType(this, uri)
+                    if (mime != null) {
+                        val filename = FilenameUtils.getFilenameFromUri(this, uri)
+                        Media(uri, filename, mime, 0, 0, 0, 0, null, null)
+                    } else null
+                }
+
+                if (mediaList.isNotEmpty()) {
+                    startActivityForResult(MediaSendActivity.buildEditorIntent(
+                        this,
+                        mediaList,
+                        viewModel.recipient.address,
+                        getMessageBody()
+                    ), PICK_FROM_LIBRARY)
+                    return
+                }
+            }
+        }
+
         val mediaURI = intent.data
         val mediaType = AttachmentManager.MediaType.from(intent.type)
         val mimeType =  MediaUtil.getMimeType(this, mediaURI)
@@ -956,7 +980,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             val filename = FilenameUtils.getFilenameFromUri(this, mediaURI)
 
             if (mimeType != null &&
-                        (AttachmentManager.MediaType.IMAGE == mediaType ||
+                (AttachmentManager.MediaType.IMAGE == mediaType ||
                         AttachmentManager.MediaType.GIF    == mediaType ||
                         AttachmentManager.MediaType.VIDEO  == mediaType)
             ) {
@@ -1571,8 +1595,8 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             title(R.string.block)
             text(
                 Phrase.from(context, R.string.blockDescription)
-                .put(NAME_KEY, name)
-                .format()
+                    .put(NAME_KEY, name)
+                    .format()
             )
             dangerButton(R.string.block, R.string.AccessibilityId_blockConfirm) {
                 viewModel.block()
@@ -1798,7 +1822,6 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             // Send it
             reactionMessage.reaction = Reaction.from(originalMessage.timestamp, originalAuthor.toString(), emoji, true)
             if (recipient.address is Address.Community) {
-
                 // Increment the reaction count locally immediately. This
                 // has to apply on all the ReactionRecords with the same messageId/emoji per design.
                 reactionDb.updateAllCountFor(messageId, emoji, 1)
@@ -1861,7 +1884,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
 
 
                 val messageServerId = lokiMessageDb.getServerID(originalMessage.messageId) ?:
-                    return Log.w(TAG, "Failed to find message server ID when removing emoji reaction")
+                return Log.w(TAG, "Failed to find message server ID when removing emoji reaction")
 
                 scope.launch {
                     runCatching {
@@ -2876,4 +2899,4 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             }
         }
     }
-}
+}