tangled mirror of catsky-🐱 Soothing soft social-app fork with all the niche toggles! (Unofficial); for issues and PRs please put them on github:NekoDrone/catsky-social
[Video] Add dimension info to share intent (#5639)
+47
-14
+23
-1
modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt
+23
-1
modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt
···
2
2
3
3
import android.content.Intent
4
4
import android.graphics.Bitmap
5
+
import android.media.MediaMetadataRetriever
5
6
import android.net.Uri
6
7
import android.os.Build
7
8
import android.provider.MediaStore
···
143
144
appContext.currentActivity?.contentResolver?.openInputStream(uri)?.use {
144
145
it.copyTo(out)
145
146
}
146
-
"bluesky://intent/compose?videoUri=${URLEncoder.encode(file.path, "UTF-8")}".toUri().let {
147
+
148
+
val info = getVideoInfo(uri) ?: return
149
+
150
+
"bluesky://intent/compose?videoUri=${URLEncoder.encode(file.path, "UTF-8")}|${info["width"]}|${info["height"]}".toUri().let {
147
151
val newIntent = Intent(Intent.ACTION_VIEW, it)
148
152
appContext.currentActivity?.startActivity(newIntent)
149
153
}
···
163
167
"width" to bitmap.width,
164
168
"height" to bitmap.height,
165
169
"path" to file.path.toString(),
170
+
)
171
+
}
172
+
173
+
private fun getVideoInfo(uri: Uri): Map<String, Any>? {
174
+
val retriever = MediaMetadataRetriever()
175
+
retriever.setDataSource(appContext.currentActivity, uri)
176
+
177
+
val width = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toIntOrNull()
178
+
val height = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toIntOrNull()
179
+
180
+
if (width == null || height == null) {
181
+
return null
182
+
}
183
+
184
+
return mapOf(
185
+
"width" to width,
186
+
"height" to height,
187
+
"path" to uri.path.toString(),
166
188
)
167
189
}
168
190
+2
-1
src/lib/hooks/useIntentHandler.ts
+2
-1
src/lib/hooks/useIntentHandler.ts
···
93
93
94
94
// Whenever a video URI is present, we don't support adding images right now.
95
95
if (videoUri) {
96
+
const [uri, width, height] = videoUri.split('|')
96
97
openComposer({
97
98
text: text ?? undefined,
98
-
videoUri,
99
+
videoUri: {uri, width: Number(width), height: Number(height)},
99
100
})
100
101
return
101
102
}
+1
-1
src/state/shell/composer/index.tsx
+1
-1
src/state/shell/composer/index.tsx
···
38
38
openEmojiPicker?: (pos: DOMRect | undefined) => void
39
39
text?: string
40
40
imageUris?: {uri: string; width: number; height: number; altText?: string}[]
41
-
videoUri?: string
41
+
videoUri?: {uri: string; width: number; height: number}
42
42
}
43
43
44
44
type StateContext = ComposerOpts | undefined
+1
-1
src/view/com/composer/Composer.tsx
+1
-1
src/view/com/composer/Composer.tsx
···
218
218
// Whenever we receive an initial video uri, we should immediately run compression if necessary
219
219
useEffect(() => {
220
220
if (initVideoUri) {
221
-
selectVideo({uri: initVideoUri} as ImagePickerAsset)
221
+
selectVideo(initVideoUri)
222
222
}
223
223
}, [initVideoUri, selectVideo])
224
224