dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-03-30 20:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: Multiple images sharing (#1206)

Browse Source
This commit is contained in:
Stanislav Dmitrenko
2022-10-13 20:39:24 +03:00
committed by GitHub
parent 3bf8361911
commit 799d9443bd
5 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/android/app/src/main/AndroidManifest.xml
View File

@@ -69,6 +69,11 @@
<category android:name="android.intent.category.DEFAULT" />
<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="image/*" />
</intent-filter>
</activity>
<activity-alias

13
apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt
View File

@@ -398,13 +398,24 @@ fun processExternalIntent(intent: Intent?, chatModel: ChatModel) {
chatModel.sharedContent.value = SharedContent.Text(it)
}
intent.type?.startsWith("image/") == true -> (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
chatModel.sharedContent.value = SharedContent.Image(it)
chatModel.sharedContent.value = SharedContent.Images(listOf(it))
} // All other mime types
else -> (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
chatModel.sharedContent.value = SharedContent.File(it)
}
}
}
Intent.ACTION_SEND_MULTIPLE -> {
// Close active chat and show a list of chats
chatModel.chatId.value = null
chatModel.clearOverlays.value = true
when {
intent.type?.startsWith("image/") == true -> (intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM) as? List<Uri>)?.let {
chatModel.sharedContent.value = SharedContent.Images(it)
} // All other mime types
else -> {}
}
}
}
}

2
apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt
View File

@@ -500,7 +500,7 @@ fun ComposeView(
LaunchedEffect(chatModel.sharedContent.value) {
when (val shared = chatModel.sharedContent.value) {
is SharedContent.Text -> onMessageChange(shared.text)
is SharedContent.Image -> processPickedImage(listOf(shared.uri))
is SharedContent.Images -> processPickedImage(shared.uris)
is SharedContent.File -> processPickedFile(shared.uri)
null -> {}
}

2
apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt
View File

@@ -93,7 +93,7 @@ private fun ShareListToolbar(chatModel: ChatModel, stopped: Boolean, onSearchVal
Text(
when (chatModel.sharedContent.value) {
is SharedContent.Text -> stringResource(R.string.share_message)
is SharedContent.Image -> stringResource(R.string.share_image)
is SharedContent.Images -> stringResource(R.string.share_image)
is SharedContent.File -> stringResource(R.string.share_file)
else -> stringResource(R.string.share_message)
},

2
apps/android/app/src/main/java/chat/simplex/app/views/helpers/Enums.kt
View File

@@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
sealed class SharedContent {
data class Text(val text: String): SharedContent()
data class Image(val uri: Uri): SharedContent()
data class Images(val uris: List<Uri>): SharedContent()
data class File(val uri: Uri): SharedContent()
}