Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
5 changes: 4 additions & 1 deletion lib/jni/Sanitizer_jni.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ JNIEXPORT jboolean JNICALL
Java_com_microsoft_applications_events_Sanitizer_nativeInitialize(
JNIEnv *env, jclass /* this */,
jlong iLoggerNativePtr,
jstring notificationEventName) {
jstring notificationEventName,
jboolean warningsToSanitization) {

if (spSanitizer != nullptr) {
return false;
Expand All @@ -40,6 +41,8 @@ Java_com_microsoft_applications_events_Sanitizer_nativeInitialize(
sanitizerConfig.NotificationEventName = JStringToStdString(env, notificationEventName).c_str();
}

sanitizerConfig.SetAllWarningsToSanitizations = static_cast<bool>(warningsToSanitization);

spSanitizer = std::make_shared<Sanitizer>(sanitizerConfig);
return true;
}
Expand Down
1 change: 1 addition & 0 deletions wrappers/obj-c/ODWSanitizer.mm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ +(void)initializeSanitizer:(ILogger *)logger withODWSanitizerInitConfig:(ODWSani
{
config.NotificationEventName = [[initConfigObject notificationEventName] UTF8String];
}
config.SetAllWarningsToSanitizations = [initConfigObject setAllWarningsToSanitization];

_sanitizerPtr = std::make_shared<Sanitizer>(config);
LogManager::GetInstance()->SetDataInspector(_sanitizerPtr);
Expand Down
8 changes: 8 additions & 0 deletions wrappers/obj-c/ODWSanitizerInitConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ NS_ASSUME_NONNULL_BEGIN
*/
@property(readwrite, copy, nonatomic) NSString* notificationEventName;

/*!
@brief (OPTIONAL) If enabled this will force sanitization for Urls, emails and site paths. The Default value is `YES`.
*/
@property(readwrite, nonatomic) BOOL setWarningsToSanitization;

// Initializer
- (instancetype)init;

@end
NS_ASSUME_NONNULL_END

Expand Down
9 changes: 9 additions & 0 deletions wrappers/obj-c/ODWSanitizerInitConfig.mm
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,13 @@
*/
@implementation ODWSanitizerInitConfig : NSObject

- (instancetype)init {
self = [super init];
if (self) {
_notificationEventName = @"SanitizerConcerns"; // Default event name
_setWarningsToSanitization = YES; // Default to true
}
return self;
}

@end
2 changes: 1 addition & 1 deletion wrappers/swift/Sources/OneDSSwift/Sanitizer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public final class Sanitizer {
}

/// Resets the Sanitizer instance.
public static func resetPrivacyGuardInstance() {
public static func resetSanitizerInstance() {
ODWSanitizer.resetSanitizerInstance()
}
}
10 changes: 10 additions & 0 deletions wrappers/swift/Sources/OneDSSwift/SanitizerInitConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ public final class SanitizerInitConfig {
}
}

/// (OPTIONAL) If enabled this will force sanitization for Urls, emails and site paths.
public var setWarningsToSanitization: Bool {
get {
odwSanitizerInitConfig.setWarningsToSanitization
}
set {
odwSanitizerInitConfig.setWarningsToSanitization = newValue
}
}

/**
Returns the Obj-C object of the wrapper.

Expand Down
Loading