Fixed issue with game events when recording in multi-threaded environ…

…ment Removed obsolete code Added bundleId to init call
Nefta-io · Apr 16, 2024 · 15880e8 · 15880e8
1 parent 0743cde
commit 15880e8
Show file tree

Hide file tree

Showing 31 changed files with 2,813 additions and 3,992 deletions.
diff --git a/Assets/Nefta/Adapter.cs b/Assets/Nefta/Adapter.cs
@@ -25,7 +25,7 @@ public class Adapter
         private static extern void NeftaPlugin_Record(IntPtr instance, string recordedEvent);
 
         [DllImport ("__Internal")]
-        private static extern string NeftaPlugin_ShowNuid(IntPtr instance);
+        private static extern string NeftaPlugin_GetNuid(IntPtr instance, bool present);
 
         private static IntPtr _plugin;
 #elif UNITY_ANDROID
@@ -115,14 +115,14 @@ public static void Record(GameEvent gameEvent)
 #endif
         }
 
-        public static string ShowNuid()
+        public static string GetNuid(bool present)
         {
             string nuid = null;
 #if UNITY_EDITOR
 #elif UNITY_IOS
-            nuid = NeftaPlugin_ShowNuid(_plugin);
+            nuid = NeftaPlugin_GetNuid(_plugin, present);
 #elif UNITY_ANDROID
-            nuid = _plugin.Call<string>("ShowNuid");
+            nuid = _plugin.Call<string>("GetNuid", present);
 #endif
             return nuid;
         }

diff --git a/Assets/Nefta/Plugins/Android/NeftaCustomAdapter-debug-1.2.7.aar b/Assets/Nefta/Plugins/Android/NeftaCustomAdapter-debug-1.2.7.aar
diff --git a/Assets/Nefta/Plugins/Android/NeftaCustomAdapter-debug-1.2.8.aar b/Assets/Nefta/Plugins/Android/NeftaCustomAdapter-debug-1.2.8.aar
diff --git a/...d/NeftaCustomAdapter-debug-1.2.7.aar.meta → ...d/NeftaCustomAdapter-debug-1.2.8.aar.meta b/...d/NeftaCustomAdapter-debug-1.2.7.aar.meta → ...d/NeftaCustomAdapter-debug-1.2.8.aar.meta
diff --git a/Assets/Nefta/Plugins/Android/NeftaCustomAdapter-release-1.2.7.aar b/Assets/Nefta/Plugins/Android/NeftaCustomAdapter-release-1.2.7.aar
diff --git a/Assets/Nefta/Plugins/Android/NeftaCustomAdapter-release-1.2.8.aar b/Assets/Nefta/Plugins/Android/NeftaCustomAdapter-release-1.2.8.aar
diff --git a/...NeftaCustomAdapter-release-1.2.7.aar.meta → ...NeftaCustomAdapter-release-1.2.8.aar.meta b/...NeftaCustomAdapter-release-1.2.7.aar.meta → ...NeftaCustomAdapter-release-1.2.8.aar.meta
diff --git a/Assets/Nefta/Plugins/iOS/ISNeftaCustomAdapter.m b/Assets/Nefta/Plugins/iOS/ISNeftaCustomAdapter.m
@@ -164,7 +164,7 @@ - (NSString *) networkSDKVersion {
 }
 
 - (NSString *) adapterVersion {
-    return @"1.2.7";
+    return @"1.2.8";
 }
 
 + (void)ApplyRenderer:(UIViewController *)viewController {

diff --git a/Assets/Nefta/Plugins/iOS/NeftaAdapter.m b/Assets/Nefta/Plugins/iOS/NeftaAdapter.m
@@ -8,7 +8,7 @@
     void EnableLogging(bool enable);
     void * NeftaPlugin_Init(const char *appId);
     void NeftaPlugin_Record(void *instance, const char *event);
-    const char * NeftaPlugin_ShowNuid(void *instance);
+    const char * NeftaPlugin_GetNuid(void *instance, bool present);
 #ifdef __cplusplus
 }
 #endif
@@ -28,8 +28,8 @@ void NeftaPlugin_Record(void *instance, const char *event) {
     [_plugin RecordWithEvent: [NSString stringWithUTF8String: event]];
 }
 
-const char * NeftaPlugin_ShowNuid(void *instance) {
-    const char *string = [[_plugin ShowNuid] UTF8String];
+const char * NeftaPlugin_GetNuid(void *instance, bool present) {
+    const char *string = [[_plugin GetNuidWithPresent: present] UTF8String];
     char *returnString = (char *)malloc(strlen(string) + 1);
     strcpy(returnString, string);
     return returnString;

diff --git a/Assets/Nefta/Plugins/iOS/NeftaIsAdapter.h b/Assets/Nefta/Plugins/iOS/NeftaIsAdapter.h
diff --git a/Assets/Nefta/Plugins/iOS/NeftaIsAdapter.h.meta b/Assets/Nefta/Plugins/iOS/NeftaIsAdapter.h.meta
diff --git a/Assets/Nefta/Plugins/iOS/NeftaSDK.xcframework/Info.plist b/Assets/Nefta/Plugins/iOS/NeftaSDK.xcframework/Info.plist
@@ -41,7 +41,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XFWK</string>
 	<key>Version</key>
-	<string>3.2.7</string>
+	<string>3.2.8</string>
 	<key>XCFrameworkFormatVersion</key>
 	<string>1.0</string>
 </dict>

diff --git a/...ta/Plugins/iOS/NeftaSDK.xcframework/ios-arm64/NeftaSDK.framework/Headers/NeftaSDK-Swift.h b/...ta/Plugins/iOS/NeftaSDK.xcframework/ios-arm64/NeftaSDK.framework/Headers/NeftaSDK-Swift.h
@@ -454,9 +454,6 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, copy) void (^ _Nullable OnLog)
 @property (nonatomic, copy) void (^ _Nullable IOnReward)(NSString * _Nonnull);
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
-- (NSString * _Nullable)GetToolboxUser SWIFT_WARN_UNUSED_RESULT;
-- (void)SetToolboxUserWithJson:(NSString * _Nonnull)json;
-- (void)SetCustomBatchSize:(NSInteger)newBatchSize;
 - (void)RecordWithEvent:(NSString * _Nonnull)event;
 - (void)EnableAds:(BOOL)enable;
 - (void)EnableBannerWithEnable:(BOOL)enable;
@@ -476,7 +473,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, copy) void (^ _Nullable OnLog)
 - (void)Close;
 - (void)CloseWithId:(NSString * _Nonnull)id;
 - (void)Mute:(BOOL)mute;
-- (NSString * _Nonnull)ShowNuid SWIFT_WARN_UNUSED_RESULT;
+- (NSString * _Nonnull)GetNuidWithPresent:(BOOL)present SWIFT_WARN_UNUSED_RESULT;
 - (UIView * _Nullable)GetViewForPlacement:(Placement * _Nonnull)placement show:(BOOL)show SWIFT_WARN_UNUSED_RESULT;
 @end