Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> baseTrackingDomains = getStringArrayList(base, "NSPrivacyTrackingDomains");
ArrayList<String> 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<XMLPropertyListConfiguration> baseCollectedDataTypes = getArrayList(base, "NSPrivacyCollectedDataTypes");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ public void testMergePrivacyManifest() throws IOException {
+ "<plist version=\"1.0\">\n"
+ " <dict>\n"
+ " <key>NSPrivacyTracking</key>\n"
+ " <false/>\n"
+ " <true/>\n"
+ "\n"
+ " <key>NSPrivacyCollectedDataTypes</key>\n"
+ " <array>\n"
Expand Down
Loading