Add StampEventIKeyForConcerns option in Java layer (#1107)

* Add StampEventIKeyForConcerns option in Java layer * Update modules version and bump version * Bump version to speed up release.
microsoft · Mar 6, 2023 · 3c77727 · 3c77727
1 parent 76a1051
commit 3c77727
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/PrivacyGuard.java b/lib/android_build/maesdk/src/main/java/com/microsoft/applications/events/PrivacyGuard.java
@@ -15,6 +15,7 @@ private static native boolean nativeInitializePrivacyGuard(
             boolean UseEventFieldPrefix,
             boolean ScanForUrls,
             boolean DisableAdvancedScans,
+            boolean StampEventIKeyForConcerns,
             String domainName,
             String machineName,
             Object[] userNames,
@@ -31,7 +32,8 @@ private static native boolean nativeInitializePrivacyGuardWithoutCommonDataConte
             String SummaryEventName,
             boolean UseEventFieldPrefix,
             boolean ScanForUrls,
-            boolean DisableAdvancedScans
+            boolean DisableAdvancedScans,
+            boolean StampEventIKeyForConcerns
             );
 
     /**
@@ -61,6 +63,7 @@ public static boolean initialize(PrivacyGuardInitConfig initConfig)
                     initConfig.UseEventFieldPrefix,
                     initConfig.ScanForUrls,
                     initConfig.DisableAdvancedScans,
+                    initConfig.StampEventIKeyForConcerns,
                     initConfig.DataContext.domainName,
                     initConfig.DataContext.machineName,
                     initConfig.DataContext.userNames.toArray(),
@@ -78,7 +81,8 @@ public static boolean initialize(PrivacyGuardInitConfig initConfig)
                     initConfig.SummaryEventName,
                     initConfig.UseEventFieldPrefix,
                     initConfig.ScanForUrls,
-                    initConfig.DisableAdvancedScans
+                    initConfig.DisableAdvancedScans,
+                    initConfig.StampEventIKeyForConcerns
             );
         }
     }

diff --git a/..._build/maesdk/src/main/java/com/microsoft/applications/events/PrivacyGuardInitConfig.java b/..._build/maesdk/src/main/java/com/microsoft/applications/events/PrivacyGuardInitConfig.java
@@ -69,4 +69,10 @@ public PrivacyGuardInitConfig(ILogger logger, CommonDataContext context)
      * Default value is `false`.
      */
     public boolean DisableAdvancedScans = false;
+
+    /**
+     * (OPTIONAL) Should stamp the iKey for the scanned event as an additional property on Concerns.
+     * Default value is `false`.
+     */
+    public boolean StampEventIKeyForConcerns = false;
 }
diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp
@@ -6,8 +6,8 @@
 #define MAT_VERSION_HPP
 // WARNING: DO NOT MODIFY THIS FILE!
 // This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.7.46.1"
-#define BUILD_VERSION 3,7,46,1
+#define BUILD_VERSION_STR "3.7.62.1"
+#define BUILD_VERSION 3,7,62,1
 
 #ifndef RESOURCE_COMPILER_INVOKED
 #include "ctmacros.hpp"
@@ -18,7 +18,7 @@ namespace MAT_NS_BEGIN {
 uint64_t const Version =
     ((uint64_t)3 << 48) |
     ((uint64_t)7 << 32) |
-    ((uint64_t)46 << 16) |
+    ((uint64_t)62 << 16) |
     ((uint64_t)1);
 
 } MAT_NS_END

diff --git a/lib/jni/PrivacyGuard_jni.cpp b/lib/jni/PrivacyGuard_jni.cpp
@@ -53,7 +53,8 @@ Java_com_microsoft_applications_events_PrivacyGuard_nativeInitializePrivacyGuard
         jstring SummaryEventName,
         jboolean UseEventFieldPrefix,
         jboolean ScanForUrls,
-        jboolean DisableAdvancedScans) {
+        jboolean DisableAdvancedScans,
+        jboolean StampEventIKeyForConcerns) {
     if (spPrivacyGuard != nullptr) {
         return false;
     }
@@ -76,6 +77,7 @@ Java_com_microsoft_applications_events_PrivacyGuard_nativeInitializePrivacyGuard
     config.UseEventFieldPrefix = static_cast<bool>(UseEventFieldPrefix);
     config.ScanForUrls = static_cast<bool>(ScanForUrls);
     config.DisableAdvancedScans = static_cast<bool>(DisableAdvancedScans);
+    config.StampEventIKeyForConcerns = static_cast<bool>(StampEventIKeyForConcerns);
 
     spPrivacyGuard = std::make_shared<PrivacyGuard>(config);
     return true;
@@ -92,6 +94,7 @@ Java_com_microsoft_applications_events_PrivacyGuard_nativeInitializePrivacyGuard
         jboolean UseEventFieldPrefix,
         jboolean ScanForUrls,
         jboolean DisableAdvancedScans,
+        jboolean StampEventIKeyForConcerns,
         jstring domainName,
         jstring machineName,
         jobjectArray userNames,
@@ -131,6 +134,7 @@ Java_com_microsoft_applications_events_PrivacyGuard_nativeInitializePrivacyGuard
     config.UseEventFieldPrefix = static_cast<bool>(UseEventFieldPrefix);
     config.ScanForUrls = static_cast<bool>(ScanForUrls);
     config.DisableAdvancedScans = static_cast<bool>(DisableAdvancedScans);
+    config.StampEventIKeyForConcerns = static_cast<bool>(StampEventIKeyForConcerns);
 
     spPrivacyGuard = std::make_shared<PrivacyGuard>(config);
     return true;

diff --git a/lib/modules b/lib/modules