6 internal data class SharePayload(
7 @Field var value: String = "",
8 @Field var shareType: ShareType = ShareType.Text,
9- @Field var mimeType: String = "text/plain"
10+ @Field var mimeType: String = "text/plain",
11+ @Field var originalName: String? = null
12 ) : Record
14 @OptimizedRecord
20 import java.io.FileOutputStream
21 import java.net.HttpURLConnection
22 import java.net.URL
23+import java.util.UUID
24 import kotlin.text.indexOf
25 import kotlin.text.substring
29 private fun resolveUri(context: Context, uri: Uri, mimeType: String): ResolvedSharePayload {
30 val contentResolver = context.contentResolver
31- val fileName = getFileName(contentResolver, uri) ?: "unknown"
32+ val fileName = safeFileName(getFileName(contentResolver, uri))
33 val fileSize = getFileSize(contentResolver, uri)
34 val specificMimeType = contentResolver.getType(uri) ?: mimeType
35 val type = ShareType.fromMimeType(specificMimeType)
37- // Copy to cache dir to ensure access
38- val file = File(context.cacheDir, fileName)
39+ // The sending app controls the name, so copy into a fresh directory and refuse any
40+ // destination that resolves outside cacheDir.
41+ val cacheDir = context.cacheDir.canonicalFile
42+ val file = File(File(cacheDir, "shared-${UUID.randomUUID()}"), fileName)
43+ if (!file.canonicalPath.startsWith(cacheDir.path + File.separator)) {
44+ throw SecurityException("Shared file name escapes the cache directory")
45+ }
46 try {
47+ file.parentFile?.mkdirs()
48 contentResolver.openInputStream(uri)?.use { input ->
49 FileOutputStream(file).use { output ->
50 input.copyTo(output)
52 }
53 }
55+ private fun safeFileName(name: String?): String {
56+ val baseName = name?.let { File(it).name }
57+ return if (baseName.isNullOrBlank() || baseName == "." || baseName == "..") "unknown" else baseName
58+ }
59+
60 private fun getFileName(resolver: ContentResolver, uri: Uri): String? {
61 val cursor = resolver.query(uri, null, null, null, null)
62 val name = cursor?.use { cursor ->
68 import android.content.Context
69 import android.content.Intent
70 import android.net.Uri
71+import android.provider.OpenableColumns
73 internal class SimpleShareIntentDataParser {
74 companion object {
76 }
78 private fun handleSendAction(context: Context, intent: Intent, type: String): List<SharePayload> {
79- return if (type == "text/plain") {
80- val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: return emptyList()
81- val isUrl = android.util.Patterns.WEB_URL.matcher(text).matches()
82-
83- listOf(
84+ val stream = intent.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)
85+ val text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT)?.toString()
86+ if (stream == null) {
87+ if (!type.startsWith("text/") || text == null) return emptyList()
88+ return listOf(
89 SharePayload().apply {
90 value = text
91- shareType = if (isUrl) {
92- ShareType.Url
93- } else {
94- ShareType.Text
95- }
96- mimeType = "text/plain"
97+ shareType = if (android.util.Patterns.WEB_URL.matcher(text).matches()) ShareType.Url else ShareType.Text
98+ mimeType = type
99 }
100 )
101- } else {
102- val uri = intent.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)
103- listOfNotNull(uri?.let { createUriPayload(context, it, type) })
104 }
105+ val filePayload = createUriPayload(context, stream, type)
106+ if (text.isNullOrBlank()) return listOf(filePayload)
107+ val textPayload = SharePayload().apply {
108+ value = text
109+ shareType = if (android.util.Patterns.WEB_URL.matcher(text).matches()) ShareType.Url else ShareType.Text
110+ mimeType = "text/plain"
111+ }
112+ return listOf(textPayload, filePayload)
113 }
115 private fun handleSendMultipleAction(context: Context, intent: Intent, type: String): List<SharePayload> {
118 private fun createUriPayload(context: Context, uri: Uri, defaultType: String): SharePayload {
119 val specificType = context.contentResolver.getType(uri) ?: defaultType
120+ // A blank DISPLAY_NAME must stay null: consumers treat originalName as
121+ // the attachment name, and an empty name fails contract validation.
122+ val displayName = runCatching {
123+ context.contentResolver.query(
124+ uri,
125+ arrayOf(OpenableColumns.DISPLAY_NAME),
126+ null,
127+ null,
128+ null
129+ )?.use { cursor ->
130+ val column = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
131+ if (column >= 0 && cursor.moveToFirst()) cursor.getString(column) else null
132+ }
133+ }.getOrNull()?.takeIf { it.isNotBlank() }
134 return SharePayload().apply {
135 value = uri.toString()
136- shareType = ShareType.fromMimeType(specificType)
137+ shareType = if (specificType.startsWith("text/")) ShareType.File else ShareType.fromMimeType(specificType)
138 mimeType = specificType
139+ originalName = displayName
140 }
141 }
142 }
148 * @default 'text/plain'
149 */
150 mimeType?: string;
151+ /**
152+ * The display name of a shared file, when the source app provided one.
153+ * Populated on Android from the content resolver's `DISPLAY_NAME`.
154+ */
155+ originalName?: string | null;
156 };
157 export type BaseResolvedSharePayload = SharePayload & {
158 /**
164 }).flat();
165 // Add generated files
166 targetFiles.push(`${targetName}.entitlements`);
167- targetFiles.push(`Info.plist`);
168 const sharedFiles = Object.values(shareExtensionFiles.sharedFiles ?? []).flat().map((file)=>_path().default.join(sharedFilesPath, file)).map((file)=>_path().default.relative(_path().default.join(platformProjectRoot, targetName, 'shared'), file));
169- const { uuid: mainGroupUuid } = xcodeProject.addPbxGroup(targetFiles, targetName, targetName);
170+ const { uuid: mainGroupUuid, pbxGroup: mainGroup } = xcodeProject.addPbxGroup(targetFiles, targetName, targetName);
171+ // Xcode 27.2 rejects file references shared between groups. Bypass
172+ // addPbxGroup's path deduplication so the widget keeps its own Info.plist.
173+ const infoPlistReference = xcodeProject.generateUuid();
174+ const fileReferences = xcodeProject.pbxFileReferenceSection();
175+ fileReferences[infoPlistReference] = {
176+ isa: 'PBXFileReference',
177+ lastKnownFileType: 'text.plist.xml',
178+ path: 'Info.plist',
179+ sourceTree: '"<group>"'
180+ };
181+ fileReferences[`${infoPlistReference}_comment`] = 'Info.plist';
182+ mainGroup.children.push({
183+ value: infoPlistReference,
184+ comment: 'Info.plist'
185+ });
186 const { uuid: sharedGroupUuid } = xcodeProject.addPbxGroup(sharedFiles, 'shared', 'shared');
187 if (mainGroupUuid && sharedGroupUuid) {
188 // @ts-expect-error: TODO(@kitten): This used to be untyped, and is failing now
195 // Add generated files
196 targetFiles.push(`${targetName}.entitlements`);
197- targetFiles.push(`Info.plist`);
199 const sharedFiles = Object.values(shareExtensionFiles.sharedFiles ?? [])
200 .flat()
201 .map((file) => path.join(sharedFilesPath, file))
202 .map((file) => path.relative(path.join(platformProjectRoot, targetName, 'shared'), file));
204- const { uuid: mainGroupUuid } = xcodeProject.addPbxGroup(targetFiles, targetName, targetName);
205+ const { uuid: mainGroupUuid, pbxGroup: mainGroup } = xcodeProject.addPbxGroup(
206+ targetFiles,
207+ targetName,
208+ targetName
209+ );
210+ // Xcode 27.2 rejects file references shared between groups. Bypass
211+ // addPbxGroup's path deduplication so the widget keeps its own Info.plist.
212+ const infoPlistReference = xcodeProject.generateUuid();
213+ const fileReferences = xcodeProject.pbxFileReferenceSection();
214+ fileReferences[infoPlistReference] = {
215+ isa: 'PBXFileReference',
216+ lastKnownFileType: 'text.plist.xml',
217+ path: 'Info.plist',
218+ sourceTree: '"<group>"',
219+ };
220+ fileReferences[`${infoPlistReference}_comment`] = 'Info.plist';
221+ mainGroup.children.push({ value: infoPlistReference, comment: 'Info.plist' });
222 const { uuid: sharedGroupUuid } = xcodeProject.addPbxGroup(sharedFiles, 'shared', 'shared');
224 if (mainGroupUuid && sharedGroupUuid) {
230 * @default 'text/plain'
231 */
232 mimeType?: string;
233+
234+ /**
235+ * The display name of a shared file, when the source app provided one.
236+ * Populated on Android from the content resolver's `DISPLAY_NAME`.
237+ */
238+ originalName?: string | null;
239 };
241 export type BaseResolvedSharePayload = SharePayload & {