mattermost-mobile/patches/expo-video-thumbnails+9.0.3.patch
Elias Nahum 44eb76bed7
feat(iOS): Add Microsoft Intune MAM integration with multi-server support (#9312)
* refactor: implement custom ExpoImage wrapper for cache control

Add ExpoImage component with automatic cacheKey/cachePath management and replace all expo-image imports across the app

* refactor(ios): convert Gekidou to CocoaPods

Migrate from Swift Package Manager to CocoaPods, add Keychain write operations, refactor notification handler to remove react-native-notifications headers, and upgrade Swift to 5.0

* npm audit

* update fastlane

* feat(ci): integrate Intune MAM for enterprise builds with strict OSS protection

Add Intune submodule, CI actions, Fastlane configuration, developer scripts, pre-commit hooks, and validation workflows to enable internal MAM builds while protecting OSS repository

* fix tests by mocking @mattermost/intune

* feat: implement Intune MAM integration with comprehensive security enforcement

Add IntuneManager, refactor SecurityManager/SessionManager for MAM policies, implement native OIDC auth flow, add biometric enforcement, conditional launch blocking, and file protection controls

* fix alerts when no server database is present

* Unify cache strategy

* fix emit config changed after it was stored in the db

* Handle Mid-Session Enrollment Detection

* fix ADALLogOverrideDisabled missing in Fastfile

* fix flow for initial enrollment

* fix and add unit tests

* enable Intune configuration for PR and beta builds, CLIENT_ID should be changed before actual release

* Update intune submodule with addressed feedback

* fix validate-intune-clean workflow

* feat(intune): add comprehensive error handling and SAML+Entra support

Add production-ready error handling for native Entra authentication with
user-friendly i18n messages, comprehensive test coverage, and support for
Entra login when server requires SAML.

* update i18n

* update intune submodule

* update build-pr token

* fix race condition between server auth and intune enrollment

* fix CI workflow to build with intune

* use deploy key for intune submodule

* set the config directly in the submodule .git

* debug injection

* try setting GIT_SSH_COMMAND

* remove action debug

* fix server url input

* match pod cache with intune hash

* Fastfile and envs

* have workflows check for intune/.git

* have ci cache intune frameworks as well

* update Fastlane to set no-cache to artifacts uploaded

* fix s3 upload

* fix pblist template

* Attempt to remove the cache control for PR uploads to s3

* use hash from commit for S3 path

* Implement crash-resilient selective wipe with automatic retry and add removeInternetPassword to Gekidou Keychain

* Fix surface errors from intune login

* fix postinstall scripts

* use cacheKey for draft md images

* remove unnecessary double await during test

* Have isMinimumLicenseTier accept valid license sku tier as target

* Add missing Auth error messages

* remove the last period for intune errors in i18n

* do not call unenroll with wipe on manual logout

* Fix tests and Intune error messages

* do not filter any SSO type regardless of which is used for Intune

* fix 412 to not retry

* fix tests, app logs sharing and share_extension avatar cache

* apply setScreenCapturePolicy on license change

Co-authored-by: Eva Sarafianou <eva.sarafianou@mattermost.com>

* re-apply screen capture on enrollment

Co-authored-by: Eva Sarafianou <eva.sarafianou@mattermost.com>

* use userData from intunr login and prevent getMe

Co-authored-by: Eva Sarafianou <eva.sarafianou@mattermost.com>

* Check for Biometrics and Jailbreak as we used to

---------

Co-authored-by: Eva Sarafianou <eva.sarafianou@mattermost.com>
2025-12-10 13:07:28 +02:00

120 lines
6.6 KiB
Diff

diff --git a/node_modules/expo-video-thumbnails/android/src/main/java/expo/modules/videothumbnails/VideoThumbnailOptions.kt b/node_modules/expo-video-thumbnails/android/src/main/java/expo/modules/videothumbnails/VideoThumbnailOptions.kt
index 4c9b7c1..f98bee8 100644
--- a/node_modules/expo-video-thumbnails/android/src/main/java/expo/modules/videothumbnails/VideoThumbnailOptions.kt
+++ b/node_modules/expo-video-thumbnails/android/src/main/java/expo/modules/videothumbnails/VideoThumbnailOptions.kt
@@ -11,7 +11,10 @@ data class VideoThumbnailOptions(
val time: Int = 0,
@Field
- val headers: Map<String, String> = emptyMap()
+ val headers: Map<String, String> = emptyMap(),
+
+ @Field
+ val cachePath: String? = null
) : Record
data class VideoThumbnailResult(
diff --git a/node_modules/expo-video-thumbnails/android/src/main/java/expo/modules/videothumbnails/VideoThumbnailsModule.kt b/node_modules/expo-video-thumbnails/android/src/main/java/expo/modules/videothumbnails/VideoThumbnailsModule.kt
index b5e6e5e..aae71b3 100644
--- a/node_modules/expo-video-thumbnails/android/src/main/java/expo/modules/videothumbnails/VideoThumbnailsModule.kt
+++ b/node_modules/expo-video-thumbnails/android/src/main/java/expo/modules/videothumbnails/VideoThumbnailsModule.kt
@@ -43,7 +43,14 @@ class VideoThumbnailsModule : Module() {
val thumbnail = GetThumbnail(sourceFilename, options, context).execute()
?: throw GenerateThumbnailException()
- val path = FileUtilities.generateOutputPath(context.cacheDir, "VideoThumbnails", "jpg")
+ val path = if (!options.cachePath.isNullOrEmpty()) {
+ // Use custom cache path: {cacheDir}/{cachePath}/VideoThumbnails/
+ val customDir = File(context.cacheDir, options.cachePath)
+ FileUtilities.generateOutputPath(customDir, "VideoThumbnails", "jpg")
+ } else {
+ // Use default cache path: {cacheDir}/VideoThumbnails/
+ FileUtilities.generateOutputPath(context.cacheDir, "VideoThumbnails", "jpg")
+ }
FileOutputStream(path).use { outputStream ->
thumbnail.compress(Bitmap.CompressFormat.JPEG, (options.quality * 100).toInt(), outputStream)
}
diff --git a/node_modules/expo-video-thumbnails/build/VideoThumbnailsTypes.types.d.ts b/node_modules/expo-video-thumbnails/build/VideoThumbnailsTypes.types.d.ts
index 207cbb8..d9f1791 100644
--- a/node_modules/expo-video-thumbnails/build/VideoThumbnailsTypes.types.d.ts
+++ b/node_modules/expo-video-thumbnails/build/VideoThumbnailsTypes.types.d.ts
@@ -26,5 +26,12 @@ export type VideoThumbnailsOptions = {
* In case `sourceFilename` is a remote URI, `headers` object is passed in a network request.
*/
headers?: Record<string, string>;
+ /**
+ * Custom cache subdirectory path for storing the thumbnail.
+ * Will be used as: {cacheDirectory}/{cachePath}/VideoThumbnails/
+ * If not provided, uses default cache location: {cacheDirectory}/VideoThumbnails/
+ * @example "server-abc123" or "external"
+ */
+ cachePath?: string;
};
//# sourceMappingURL=VideoThumbnailsTypes.types.d.ts.map
\ No newline at end of file
diff --git a/node_modules/expo-video-thumbnails/ios/VideoThumbnailsModule.swift b/node_modules/expo-video-thumbnails/ios/VideoThumbnailsModule.swift
index 069e3e4..11f6577 100644
--- a/node_modules/expo-video-thumbnails/ios/VideoThumbnailsModule.swift
+++ b/node_modules/expo-video-thumbnails/ios/VideoThumbnailsModule.swift
@@ -7,7 +7,7 @@ public class VideoThumbnailsModule: Module {
public func definition() -> ModuleDefinition {
Name("ExpoVideoThumbnails")
- AsyncFunction("getThumbnail", getVideoThumbnail)
+ AsyncFunction("getThumbnail", getVideoThumbnail).runOnQueue(.global())
}
internal func getVideoThumbnail(sourceFilename: URL, options: VideoThumbnailsOptions) throws -> [String: Any] {
@@ -33,7 +33,7 @@ public class VideoThumbnailsModule: Module {
let imgRef = try generator.copyCGImage(at: time, actualTime: nil)
let thumbnail = UIImage(cgImage: imgRef)
- let savedImageUrl = try saveImage(image: thumbnail, quality: options.quality)
+ let savedImageUrl = try saveImage(image: thumbnail, quality: options.quality, cachePath: options.cachePath)
return [
"uri": savedImageUrl.absoluteString,
@@ -45,8 +45,15 @@ public class VideoThumbnailsModule: Module {
/**
Saves the image as a file.
*/
- internal func saveImage(image: UIImage, quality: Double) throws -> URL {
- let directory = appContext?.config.cacheDirectory?.appendingPathComponent("VideoThumbnails")
+ internal func saveImage(image: UIImage, quality: Double, cachePath: String?) throws -> URL {
+ let directory: URL?
+ if let cachePath = cachePath, !cachePath.isEmpty {
+ // Use custom cache path: {cacheDirectory}/{cachePath}/VideoThumbnails/
+ directory = appContext?.config.cacheDirectory?.appendingPathComponent(cachePath).appendingPathComponent("VideoThumbnails")
+ } else {
+ // Use default cache path: {cacheDirectory}/VideoThumbnails/
+ directory = appContext?.config.cacheDirectory?.appendingPathComponent("VideoThumbnails")
+ }
let fileName = UUID().uuidString.appending(".jpg")
let fileUrl = directory?.appendingPathComponent(fileName)
diff --git a/node_modules/expo-video-thumbnails/ios/VideoThumbnailsOptions.swift b/node_modules/expo-video-thumbnails/ios/VideoThumbnailsOptions.swift
index 8310a8c..2f99e1f 100644
--- a/node_modules/expo-video-thumbnails/ios/VideoThumbnailsOptions.swift
+++ b/node_modules/expo-video-thumbnails/ios/VideoThumbnailsOptions.swift
@@ -4,4 +4,5 @@ internal struct VideoThumbnailsOptions: Record {
@Field var quality: Double = 1.0
@Field var time: Int64 = 0
@Field var headers: [String: String] = [String: String]()
+ @Field var cachePath: String?
}
diff --git a/node_modules/expo-video-thumbnails/src/VideoThumbnailsTypes.types.ts b/node_modules/expo-video-thumbnails/src/VideoThumbnailsTypes.types.ts
index 1576080..92fb73b 100644
--- a/node_modules/expo-video-thumbnails/src/VideoThumbnailsTypes.types.ts
+++ b/node_modules/expo-video-thumbnails/src/VideoThumbnailsTypes.types.ts
@@ -29,4 +29,11 @@ export type VideoThumbnailsOptions = {
* In case `sourceFilename` is a remote URI, `headers` object is passed in a network request.
*/
headers?: Record<string, string>;
+ /**
+ * Custom cache subdirectory path for storing the thumbnail.
+ * Will be used as: {cacheDirectory}/{cachePath}/VideoThumbnails/
+ * If not provided, uses default cache location: {cacheDirectory}/VideoThumbnails/
+ * @example "server-abc123" or "external"
+ */
+ cachePath?: string;
};