Skip to content

Commit 8afb40f

Browse files
aleqsiokosmydel
authored andcommitted
Hotfix privacy manifest aggregation script (facebook#44390)
Summary: As pointed out by liamjones here: facebook#44214 (comment) The original PR did introduce a bug in the `find/first` check, but in my testing, we do need to look at `group.name`, so let's make sure we check both. This also makes it play nice with an existing file even if it is added to a different directory, by appending to it instead of forcing it to exist in the main group. ## Changelog: [IOS] [FIXED] - Fix privacy aggregation Pull Request resolved: facebook#44390 Test Plan: Tested on rn-tester Reviewed By: cipolleschi Differential Revision: D56893594 Pulled By: philIip fbshipit-source-id: b92589bc2bed9d07e9af20c56a8b9f6c61d864f0
1 parent 2b73af0 commit 8afb40f

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

packages/react-native/scripts/cocoapods/privacy_manifest_utils.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module PrivacyManifestUtils
77
def self.add_aggregated_privacy_manifest(installer)
88
user_project = get_user_project_from(installer)
99
targets = get_application_targets(user_project)
10-
file_path = get_privacyinfo_file_path(user_project)
10+
file_path = get_privacyinfo_file_path(user_project, targets)
1111

1212
privacy_info = read_privacyinfo_file(file_path) || {
1313
"NSPrivacyCollectedDataTypes" => [],
@@ -70,13 +70,18 @@ def self.ensure_reference(file_path, user_project, target)
7070
reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref.path.end_with? "PrivacyInfo.xcprivacy" }
7171
unless reference_exists
7272
# We try to find the main group, but if it doesn't exist, we default to adding the file to the project root – both work
73-
file_root = user_project.root_object.main_group.children.first { |group| group.name == target.name } || user_project
73+
file_root = user_project.root_object.main_group.children.find { |group| group.class == Xcodeproj::Project::Object::PBXGroup && (group.name == target.name || group.path == target.name) } || user_project
7474
file_ref = file_root.new_file(file_path)
7575
build_file = target.resources_build_phase.add_file_reference(file_ref, true)
7676
end
7777
end
7878

79-
def self.get_privacyinfo_file_path(user_project)
79+
def self.get_privacyinfo_file_path(user_project, targets)
80+
file_refs = targets.flat_map { |target| target.resources_build_phase.files_references }
81+
existing_file = file_refs.find { |file_ref| file_ref.path.end_with? "PrivacyInfo.xcprivacy" }
82+
if existing_file
83+
return existing_file.real_path
84+
end
8085
# We try to find a file we know exists in the project to get the path to the main group directory
8186
info_plist_path = user_project.files.find { |file_ref| file_ref.name == "Info.plist" }
8287
if info_plist_path.nil?

0 commit comments

Comments
 (0)