Skip to content

Commit c18ed6c

Browse files
authored
Update modules commit and related wrappers (#958)
1 parent 23aa259 commit c18ed6c

File tree

6 files changed

+22
-4
lines changed

6 files changed

+22
-4
lines changed

lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/PrivacyGuard.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ private static native boolean nativeInitializePrivacyGuardWithoutCommonDataConte
2929
String SemanticContextEventName,
3030
String SummaryEventName,
3131
boolean UseEventFieldPrefix,
32-
boolean ScanForUrls
32+
boolean ScanForUrls,
33+
boolean DisableAdvancedScans
3334
);
3435

3536
/**
@@ -74,7 +75,8 @@ public static boolean initialize(PrivacyGuardInitConfig initConfig)
7475
initConfig.SemanticContextNotificationEventName,
7576
initConfig.SummaryEventName,
7677
initConfig.UseEventFieldPrefix,
77-
initConfig.ScanForUrls
78+
initConfig.ScanForUrls,
79+
initConfig.DisableAdvancedScans
7880
);
7981
}
8082
}

lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/PrivacyGuardInitConfig.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,10 @@ public PrivacyGuardInitConfig(ILogger logger, CommonDataContext context)
6363
* Default value is `true`.
6464
*/
6565
public boolean ScanForUrls = true;
66+
67+
/**
68+
* (OPTIONAL) Should disable advanced scans such as location, URLs, Out-of-scope identifiers, etc.
69+
* Default value is `false`.
70+
*/
71+
public boolean DisableAdvancedScans = false;
6672
}

lib/jni/PrivacyGuard_jni.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ Java_com_microsoft_applications_events_PrivacyGuard_nativeInitializePrivacyGuard
5252
jstring SemanticContextEventName,
5353
jstring SummaryEventName,
5454
jboolean UseEventFieldPrefix,
55-
jboolean ScanForUrls) {
55+
jboolean ScanForUrls,
56+
jboolean DisableAdvancedScans) {
5657
if (spPrivacyGuard != nullptr) {
5758
return false;
5859
}
@@ -74,6 +75,7 @@ Java_com_microsoft_applications_events_PrivacyGuard_nativeInitializePrivacyGuard
7475

7576
config.UseEventFieldPrefix = static_cast<bool>(UseEventFieldPrefix);
7677
config.ScanForUrls = static_cast<bool>(ScanForUrls);
78+
config.DisableAdvancedScans = static_cast<bool>(DisableAdvancedScans);
7779

7880
spPrivacyGuard = std::make_shared<PrivacyGuard>(config);
7981
return true;
@@ -89,6 +91,7 @@ Java_com_microsoft_applications_events_PrivacyGuard_nativeInitializePrivacyGuard
8991
jstring SummaryEventName,
9092
jboolean UseEventFieldPrefix,
9193
jboolean ScanForUrls,
94+
jboolean DisableAdvancedScans,
9295
jstring domainName,
9396
jstring machineName,
9497
jobjectArray userNames,
@@ -127,6 +130,7 @@ Java_com_microsoft_applications_events_PrivacyGuard_nativeInitializePrivacyGuard
127130

128131
config.UseEventFieldPrefix = static_cast<bool>(UseEventFieldPrefix);
129132
config.ScanForUrls = static_cast<bool>(ScanForUrls);
133+
config.DisableAdvancedScans = static_cast<bool>(DisableAdvancedScans);
130134

131135
spPrivacyGuard = std::make_shared<PrivacyGuard>(config);
132136
return true;

lib/modules

wrappers/obj-c/ODWPrivacyGuard.mm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ +(void)initializePrivacyGuard:(ILogger *)logger withODWPrivacyGuardInitConfig:(O
104104
}
105105
config.UseEventFieldPrefix = [initConfigObject useEventFieldPrefix];
106106
config.ScanForUrls = [initConfigObject scanForUrls];
107+
config.DisableAdvancedScans = [initConfigObject disableAdvancedScans];
107108
_privacyGuardPtr = std::make_shared<PrivacyGuard>(config);
108109
LogManager::GetInstance()->SetDataInspector(_privacyGuardPtr);
109110
}

wrappers/obj-c/ODWPrivacyGuardInitConfig.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ NS_ASSUME_NONNULL_BEGIN
3939
*/
4040
@property(readwrite, nonatomic) BOOL scanForUrls;
4141

42+
/*!
43+
@brief (OPTIONAL) Should disable advanced scans such as location, URLs, Out-of-scope identifiers, etc.
44+
*/
45+
@property(readwrite, nonatomic) BOOL disableAdvancedScans;
46+
4247
@end
4348
NS_ASSUME_NONNULL_END
4449

0 commit comments

Comments
 (0)