diff --git a/README.md b/README.md index e79008d9..0c4ffbc2 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ There are two ways to obtain Extender's jars: As result you should have 2 jars in `./server/apps/` folder: extender.jar and manifestmergetool.jar. ### Run -To run stand-alone Extender instance use folowing script: +To run stand-alone Extender instance use following script: ```sh ./server/scripts/standalone/service-standalone.sh start ``` diff --git a/server/manifestmergetool/src/main/java/com/defold/manifestmergetool/PrivacyManifestMerger.java b/server/manifestmergetool/src/main/java/com/defold/manifestmergetool/PrivacyManifestMerger.java index 56f68e80..2a1638b5 100644 --- a/server/manifestmergetool/src/main/java/com/defold/manifestmergetool/PrivacyManifestMerger.java +++ b/server/manifestmergetool/src/main/java/com/defold/manifestmergetool/PrivacyManifestMerger.java @@ -111,13 +111,16 @@ private void mergeAccessedAPITypes(XMLPropertyListConfiguration target, XMLPrope } private void mergeConfigs(XMLPropertyListConfiguration base, XMLPropertyListConfiguration lib) throws PlistMergeException { - Object baseTracking = base.getProperty("NSPrivacyTracking"); - Object libTracking = lib.getProperty("NSPrivacyTracking"); - // merge privacy tracking domains ArrayList baseTrackingDomains = getStringArrayList(base, "NSPrivacyTrackingDomains"); ArrayList libTrackingDomains = getStringArrayList(lib, "NSPrivacyTrackingDomains"); baseTrackingDomains.addAll(libTrackingDomains); + // ITMS-91064: Invalid tracking information - NSPrivacyTracking must be + // true if NSPrivacyTrackingDomains isn’t empty. + if(!baseTrackingDomains.isEmpty()) + { + base.setProperty("NSPrivacyTracking", true); + } // merge collected data types ArrayList baseCollectedDataTypes = getArrayList(base, "NSPrivacyCollectedDataTypes"); diff --git a/server/manifestmergetool/src/test/java/com/defold/manifestmergetool/ManifestMergeToolTest.java b/server/manifestmergetool/src/test/java/com/defold/manifestmergetool/ManifestMergeToolTest.java index 7302ddb3..9ae6fe97 100644 --- a/server/manifestmergetool/src/test/java/com/defold/manifestmergetool/ManifestMergeToolTest.java +++ b/server/manifestmergetool/src/test/java/com/defold/manifestmergetool/ManifestMergeToolTest.java @@ -758,7 +758,7 @@ public void testMergePrivacyManifest() throws IOException { + "\n" + " \n" + " NSPrivacyTracking\n" - + " \n" + + " \n" + "\n" + " NSPrivacyCollectedDataTypes\n" + " \n"