Basically my thinking is that if we want to have clients immediately start sending blob-hosted multimedia in thin threads, we should also stop shimming blob-hosted multimedia on the keyserver for recent codeVersions.

Rather than only unshimming for the most recent codeVersions, we should instead unshim for any codeVersion that can support blob-hosted multimedia.

This revision is now accepted and ready to land.Nov 7 2024, 7:22 PM

ashoat added inline comments.Nov 7 2024, 7:22 PM

lib/shared/messages/multimedia-message-spec.js
256 ↗	(On Diff #45693)	Please replace `NEXT_CODE_VERSION` here with the earliest `codeVersion` that supports blob-hosted multimedia. (Would be helpful to explain your reasoning)

bartek added inline comments.Nov 8 2024, 1:09 AM

lib/shared/messages/multimedia-message-spec.js
256 ↗	(On Diff #45693)	I think this would be `313`: https://github.com/CommE2E/comm/compare/mobile-v1.0.311...mobile-v1.0.313 This release introduced passing CSAT when fetching media in the `EncryptedImage` component - stack of D10910 is included there This release is older than `401` for which we bumped minimum supported version in D13790

bartek added inline comments.Nov 8 2024, 1:42 AM

lib/shared/messages/multimedia-message-spec.js
256 ↗	(On Diff #45693)	Actually it should be `389` because since this release we enabled CSAT for everyone. Previous releases can have it missing: https://github.com/CommE2E/comm/tree/mobile-v1.0.389

ashoat added inline comments.Nov 8 2024, 4:56 AM

lib/shared/messages/multimedia-message-spec.js
256 ↗	(On Diff #45693)	Makes sense to me!

Use version 389 as minimal

Hmmmm this doesn't look right... the file on the left doesn't seem to be master

Harbormaster completed remote builds in B32590: Diff 45716.Nov 8 2024, 5:44 AM

In D13888#388166, @ashoat wrote:

Hmmmm this doesn't look right... the file on the left doesn't seem to be master

I rebased on latest master which is this commit: d8ed20cf4b9c1488f208825b7a636b3e5d882f6d

https://github.com/CommE2E/comm/blob/d8ed20cf4b9c1488f208825b7a636b3e5d882f6d/lib/shared/messages/multimedia-message-spec.js

Sorry, you're absolutely right... that was my mistake, I mixed up FUTURE_CODE_VERSION and NEXT_CODE_VERSION

Closed by commit rCOMM6ff0c6e70b0b: [lib] Stop shimming Blob-hosted multimedia messages (authored by bartek). · Explain WhyNov 8 2024, 10:23 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM6ff0c6e70b0b: [lib] Stop shimming Blob-hosted multimedia messages.

Revision Contents
Changeset List

Path

Size

lib/

shared/

messages/

multimedia-message-spec.js

7 lines

Diff 45655

View Options

lib/shared/messages/multimedia-message-spec.js

	require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")			require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
	require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")			require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
	require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules")			require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules")

	platform :ios, '12.0'			platform :ios, '12.0'

	require 'json'			require 'json'
	podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}

	target 'Comm' do			def common_comm_target_pods
	pod 'ReactNativeKeyboardTrackingView', :path => '../../node_modules/react-native-keyboard-tracking-view'
	pod 'ReactNativeKeyboardInput', :path => '../../node_modules/react-native-keyboard-input'
	pod 'react-native-ffmpeg/min-lts', :podspec => '../../node_modules/react-native-ffmpeg/react-native-ffmpeg.podspec'
	pod 'react-native-video/VideoCaching', :podspec => '../../node_modules/react-native-video/react-native-video.podspec'
	pod 'SQLCipher-Amalgamation', :path => '../../node_modules/@commapp/sqlcipher-amalgamation'			pod 'SQLCipher-Amalgamation', :path => '../../node_modules/@commapp/sqlcipher-amalgamation'

	pod 'gRPC-C++', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'			pod 'gRPC-C++', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'
	pod 'gRPC-C++/Protobuf', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'			pod 'gRPC-C++/Protobuf', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'
	pod 'gRPC-Core', :podspec => './pod-patch/.patched/gRPC-Core/1.40.0/gRPC-Core.podspec.json'			pod 'gRPC-Core', :podspec => './pod-patch/.patched/gRPC-Core/1.40.0/gRPC-Core.podspec.json'
	pod 'Protobuf-C++', '3.15.8'			pod 'Protobuf-C++', '3.15.8'
				end

				target 'Comm' do
				pod 'ReactNativeKeyboardTrackingView', :path => '../../node_modules/react-native-keyboard-tracking-view'
				pod 'ReactNativeKeyboardInput', :path => '../../node_modules/react-native-keyboard-input'
				pod 'react-native-video/VideoCaching', :podspec => '../../node_modules/react-native-video/react-native-video.podspec'
				pod 'react-native-ffmpeg/min-lts', :podspec => '../../node_modules/react-native-ffmpeg/react-native-ffmpeg.podspec'
				common_comm_target_pods

	use_expo_modules!			use_expo_modules!
	config = use_native_modules!			config = use_native_modules!
				podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
	use_react_native!(			use_react_native!(
	:path => config[:reactNativePath],			:path => config[:reactNativePath],
	# to enable hermes on iOS, change `false` to `true` and then install pods			# to enable hermes on iOS, change `false` to `true` and then install pods
	:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'			:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
	)			)

	# Enables Flipper.			# Enables Flipper.
	#			#
	# Note that if you have use_frameworks! enabled, Flipper will not work and			# Note that if you have use_frameworks! enabled, Flipper will not work and
	# you should disable these next few lines.			# you should disable these next few lines.
	use_flipper!({ "Flipper-DoubleConversion" => "1.1.7" })			use_flipper!({ "Flipper-DoubleConversion" => "1.1.7" })
				end

				target 'NotificationService' do
				common_comm_target_pods
				pod 'OLMKit', :path => "../../node_modules/olm"
				pod 'RCT-Folly', :podspec => "../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"

				# Lines below are only needed to compile and use Expo Secure Store in Notification Service.
				# If Apple disapproves 'APPLICATION_EXTENSION_API_ONLY' flag then we can safely delete them and use
				# customized Expo Secure Store that does not depend on ExpoModulesCore
				podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
				use_expo_modules!
				use_react_native!(
				:path => "../../node_modules/react-native",
				:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
				)
				end

	post_install do \|installer\|			post_install do \|installer\|
				ashoatUnsubmitted Not Done Inline Actions Does this apply to all targets now? Are we sure we want to apply it to all targets? Is it possibly that we're inadvertedly applying it to some targets we haven't considered? (Targets that aren't the Comm app, or the notification service extension) ashoat: Does this apply to all targets now? Are we sure we want to apply it to all targets? Is it…
				marcinAuthorUnsubmitted Done Inline Actions There are two changes here compared to master branch: post_install hook is moved from target 'Comm' scope to global Podfile scope some lines are added that disable APPLICATION_EXTENSION_API_ONLY flag to enable CommonCpp sources compilation in 'NotificationService' target. Let me explain why those changes should not raise concern. Ad. 1) According to this doc: https://www.rubydoc.info/github/CocoaPods/Core/Pod%2FPodfile%2FDSL:post_install post_install is a hook applied just before XCode project is written to disk. According to this doc: https://www.rubydoc.info/gems/cocoapods-core/0.34.1/Pod/Podfile/DSL Podfile hooks always exist in global scope. Even if this post_install hook was written inside target 'Comm' scope its behaviour would be the same as if it was in global scope. This is even more confirmed by the fact that an attempt to write multiple post_install hooks (e.g. each per target) leads to errors: https://github.com/CocoaPods/CocoaPods/issues/6172. Ad. 2) Now that we established that we cannot have multiple post_install hooks and the one that we have should be in global scope we can admit it is impossible to use this flag anywhere else. marcin: There are two changes here compared to master branch: 1) post_install hook is moved from target…
				ashoatUnsubmitted Not Done Inline Actions Thanks for the explanation! ashoat: Thanks for the explanation!
	react_native_post_install(installer)			react_native_post_install(installer)
	__apply_Xcode_12_5_M1_post_install_workaround(installer)			__apply_Xcode_12_5_M1_post_install_workaround(installer)

	# Excluding arm64 because M1 simulator isn't supported yet			# Excluding arm64 because M1 simulator isn't supported yet
	# Excluding 32-bit x86 because nobody uses it and it causes compilation issues			# Excluding 32-bit x86 because nobody uses it and it causes compilation issues
	installer.pods_project.build_configurations.each do \|config\|			installer.pods_project.build_configurations.each do \|config\|
	config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386"			config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386"
				ashoatUnsubmitted Not Done Inline Actions It's a bit confusing to me that we exclude both of these here, but in the `project.pbxproj` only `arm64` is mentioned. Do you know why that is? ashoat: It's a bit confusing to me that we exclude both of these here, but in the `project.pbxproj`…
				marcinAuthorUnsubmitted Done Inline Actions Build settings in the XCode project refer to targets: Comm and NotificationService. This line changes build settings for pods. I did not modify this line and according to the explanation above it has alway been that we exclude both architectures for all pods. I do not know why it is that, but it is not related to any change introduced in this diff. Target 'Comm' excluded only amr64 architecture before I started to work on this issue and the very recent changes I introduced were to unify excluded architectures for both Comm and NotificationService. Would you like me to try whether we can exclude i386 arch for XCode targets as well? marcin: Build settings in the XCode project refer to targets: Comm and NotificationService. This line…
				ashoatUnsubmitted Not Done Inline Actions No, that's alright – thanks for this explanation ashoat: No, that's alright – thanks for this explanation
	config.build_settings['OTHER_CPLUSPLUSFLAGS'] = '-DDONT_AUTOINSTALL_REANIMATED'			config.build_settings['OTHER_CPLUSPLUSFLAGS'] = '-DDONT_AUTOINSTALL_REANIMATED'
	end			end

				# Lines below are only needed to compile and use Expo Secure Store in Notification Service.
				# If Apple disapproves 'APPLICATION_EXTENSION_API_ONLY' flag then we can safely delete them and use
				# customized Expo Secure Store that does not depend on ExpoModulesCore
				installer.pods_project.targets.each do \|target\|
				target.build_configurations.each do \|config\|
				config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
				end
	end			end
				ashoatUnsubmitted Not Done Inline Actions There's an extraneous space at the end of this line ashoat: There's an extraneous space at the end of this line
	end			end

[lib] Stop shimming Blob-hosted multimedia messagesClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 45655

lib/shared/messages/multimedia-message-spec.js

[lib] Stop shimming Blob-hosted multimedia messages
ClosedPublic
Actions

Revision Contents
Changeset List