Skip to content

Commit 178f448

Browse files
Release build 11.24.0 [ci release]
1 parent ba58674 commit 178f448

File tree

10 files changed

+31
-3
lines changed

10 files changed

+31
-3
lines changed

CHANGELOG.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
- Follow up page context redux (#1960)
2-
- [Google password import] autotap export button in modal (#1933)
1+
- Support version from platform object (#1961)

build/android/adsjsContentScope.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,9 @@
373373
};
374374
}
375375
function getPlatformVersion(preferences) {
376+
if (preferences.platform?.version !== void 0 && preferences.platform?.version !== "") {
377+
return preferences.platform.version;
378+
}
376379
if (preferences.versionNumber) {
377380
return preferences.versionNumber;
378381
}

build/android/autofillPasswordImport.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,9 @@
355355
};
356356
}
357357
function getPlatformVersion(preferences) {
358+
if (preferences.platform?.version !== void 0 && preferences.platform?.version !== "") {
359+
return preferences.platform.version;
360+
}
358361
if (preferences.versionNumber) {
359362
return preferences.versionNumber;
360363
}

build/android/brokerProtection.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,6 +1879,9 @@
18791879
};
18801880
}
18811881
function getPlatformVersion(preferences) {
1882+
if (preferences.platform?.version !== void 0 && preferences.platform?.version !== "") {
1883+
return preferences.platform.version;
1884+
}
18821885
if (preferences.versionNumber) {
18831886
return preferences.versionNumber;
18841887
}

build/android/contentScope.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,6 +1208,9 @@
12081208
};
12091209
}
12101210
function getPlatformVersion(preferences) {
1211+
if (preferences.platform?.version !== void 0 && preferences.platform?.version !== "") {
1212+
return preferences.platform.version;
1213+
}
12111214
if (preferences.versionNumber) {
12121215
return preferences.versionNumber;
12131216
}

build/apple/contentScope.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,6 +1208,9 @@
12081208
};
12091209
}
12101210
function getPlatformVersion(preferences) {
1211+
if (preferences.platform?.version !== void 0 && preferences.platform?.version !== "") {
1212+
return preferences.platform.version;
1213+
}
12111214
if (preferences.versionNumber) {
12121215
return preferences.versionNumber;
12131216
}

build/apple/contentScopeIsolated.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,6 +1913,9 @@
19131913
};
19141914
}
19151915
function getPlatformVersion(preferences) {
1916+
if (preferences.platform?.version !== void 0 && preferences.platform?.version !== "") {
1917+
return preferences.platform.version;
1918+
}
19161919
if (preferences.versionNumber) {
19171920
return preferences.versionNumber;
19181921
}

build/windows/contentScope.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2700,6 +2700,9 @@
27002700
};
27012701
}
27022702
function getPlatformVersion(preferences) {
2703+
if (preferences.platform?.version !== void 0 && preferences.platform?.version !== "") {
2704+
return preferences.platform.version;
2705+
}
27032706
if (preferences.versionNumber) {
27042707
return preferences.versionNumber;
27052708
}

injected/docs/platform-integration.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ The following placeholders are replaced during the build process:
6464
- **`$CONTENT_SCOPE$`** - Raw remote config object
6565
- **`$USER_UNPROTECTED_DOMAINS$`** - An array of user allowlisted domains
6666
- **`$USER_PREFERENCES$`** - An object containing:
67-
- `platform`: `{ name: '<ios | macos | extension | android | windows>', internal: <boolean> }`
67+
- `platform`:
68+
- `name`: '<ios | macos | extension | android | windows>',
69+
- `internal`: <boolean>
70+
- `version`: <string | number>
6871
- `debug`: boolean
6972
- `globalPrivacyControlValue`: boolean
7073
- `sessionKey`: `<CSRNG UUID 4 string>` (used for fingerprinting) - this should regenerate on browser close or every 24 hours

injected/src/utils.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,11 @@ export function computeLimitedSiteObject() {
591591
* @returns {string | number | undefined}
592592
*/
593593
function getPlatformVersion(preferences) {
594+
// Check for platform.version first
595+
if (preferences.platform?.version !== undefined && preferences.platform?.version !== '') {
596+
return preferences.platform.version;
597+
}
598+
// Fallback to legacy version fields
594599
if (preferences.versionNumber) {
595600
return preferences.versionNumber;
596601
}

0 commit comments

Comments
 (0)