Syncing changes from private repository

Author: helium-service

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file using the standards as defined at [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0).
 
+### Version 1.0.2 *(2024-09-19)*
+Added:
+- `toObjectFromJson` in `ChartboostUnityUtilities.h` for reusable JSON serialization.
+
 ### Version 1.0.1 *(2024-08-01)*
 Added:
 

Chartboost.CSharp.Utilities.Unity.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Chartboost.CSharp.Utilities.Unity</id>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <title>Chartboost Utilities for Unity</title>
     <description>Reusable Utilities for Chartboost's Unity Projects</description>
     <authors>Chartboost</authors>
@@ -13,7 +13,7 @@
     <tags>Chartboost, Ads, Mediation, Unity, cs</tags>
     <repository type="git" url="https://github.com/ChartBoost/chartboost-unity-utilities"/>
     <dependencies>
-      <dependency id="Chartboost.CSharp.Logging.Unity" version="1.0.0" />
+      <dependency id="Chartboost.CSharp.Logging.Unity" version="1.1.0" />
     </dependencies>
   </metadata>
 </package>

README.md

@@ -1,4 +1,4 @@
-# Chartboost Canary Utilities
+# Chartboost Unity Utilities
 
 Simple utilities package for the Chartboost Unity development environment.
 

Runtime/Android/AndroidExtensions.cs

@@ -1,19 +1,17 @@
 using System.Collections.Generic;
-using System.Linq;
 using Chartboost.Constants;
 using Chartboost.Logging;
 using UnityEngine;
 
 namespace Chartboost
 {
-    public static partial class AndroidExtensions 
+    public static class AndroidExtensions 
     {
         public static AndroidJavaObject DictionaryToMap(this IDictionary<string, string> source)
             => DictionaryToMap(source, SharedAndroidConstants.ClassString);
 
         public static AndroidJavaObject DictionaryToMap(this IReadOnlyDictionary<string, string> source)
             => DictionaryToMap(source, SharedAndroidConstants.ClassString);
-        
         public static AndroidJavaObject DictionaryToMap(this IReadOnlyDictionary<string, bool> source)
             => DictionaryToMap(source, SharedAndroidConstants.ClassBoolean);
 

Runtime/Android/Constants/SharedAndroidConstants.cs

@@ -48,6 +48,7 @@ public static AndroidJavaObject UnityPlayerCurrentActivity()
         public const string FunctionSet = "set";
         public const string FunctionPut = "put";
         public const string FunctionAdd = "add";
+        public const string FunctionCompleted = "completed";
 
         public const string FunctionGetLogLevel = "getLogLevel";
         public const string FunctionSetLogLevel = "setLogLevel";  

Runtime/Utilities/Json/JsonTools.cs

@@ -10,10 +10,16 @@ public static class JsonTools
         private const string JsonToolsTag = "[JsonTools]";
 
         public static string SerializeObject<T>(T target, Formatting formatting)
-            => JsonConvert.SerializeObject(target, formatting);
-        
-        public static string SerializeObject<T>(T target) 
-            => SerializeObject(target, Formatting.None);
+        {
+            if (target != null) return JsonConvert.SerializeObject(target, formatting);
+            LogController.Log($"{JsonToolsTag}/SerializeObject string value cannot be null or empty.", LogLevel.Warning);
+            return string.Empty;
+        }
+
+        public static string SerializeObject<T>(T target)
+        {
+            return SerializeObject(target, Formatting.None);
+        }
 
         public static T DeserializeObject<T>(string objectJson)
         {

Runtime/iOS/Plugins/iOS/ChartboostUnityUtilities.h

@@ -8,6 +8,11 @@ typedef void (^block)(void);
 /// - Parameter block: block of code to be executed on the main thread.
 void toMain(block block);
 
+/// Creates an id from a C String
+///
+/// - Parameter jsonString: Json string to create id from.
+id toObjectFromJson(const char * jsonString);
+
 /// Creates a null terminated C string on the heap so that our string's memory isn't wiped out right after method's return
 /// 
 /// - Parameter target: Target C string to allocate
@@ -60,6 +65,23 @@ NSMutableArray* toNSMutableArray(const char** cArray, int cArrayCount);
 ///
 /// Use to allocate a C String reference when converting from id serializable.
 ///
-/// - Parameter cString: C String to use as a base for the NSString.
+/// - Parameter data: C String to use as a base for the NSString.
 /// - Returns: Allocated JSON C String or Null.
 const char * toJSON(id data);
+
+
+/// Allocates a JSON  NSString from an id
+///
+/// Use to allocate a NSString reference when converting from id serializable.
+///
+/// - Parameter data: NString to use as a base for the NSString.
+/// - Returns: Allocated JSON NSString or Null.
+NSString * toJSONNSString(id data);
+
+/// Generates a int hashCode from a NSString
+///
+///  Use to obtain a Java like hashCode from a NSString
+///
+///  - Parameter value: Target NSString.
+///  - Returns: int Java like hashCode
+int hashCode(NSString* value);

Runtime/iOS/Plugins/iOS/ChartboostUnityUtilities.mm

@@ -4,6 +4,17 @@ void toMain(block block) {
     dispatch_async(dispatch_get_main_queue(), block);
 }
 
+id toObjectFromJson(const char * jsonString) {
+    NSData* jsonData = [[NSString stringWithUTF8String:jsonString] dataUsingEncoding:NSUTF8StringEncoding];
+    NSError* error = nil;
+    id arr = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
+
+    if (error != nil)
+        return nil;
+
+    return arr;
+}
+
 const char * allocateCString(const char* target)
 {
     if (target == NULL)
@@ -62,6 +73,12 @@ void toMain(block block) {
 }
 
 const char * toJSON(id data)
+{
+    return toCStringOrNull(toJSONNSString(data));
+}
+
+
+NSString * toJSONNSString(id data)
 {
     if (data == nil)
         return NULL;
@@ -72,6 +89,15 @@ void toMain(block block) {
         NSLog(@"%s: error: %@", __func__, error.localizedDescription);
         return NULL;
      }
-    NSString *json = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    return toCStringOrNull(json);
+    return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+}
+
+int hashCode(NSString* value) {
+    int h = 0;
+
+    for (int i = 0; i < (int)value.length; i++) {
+        h = (31 * h) + [value characterAtIndex:i];
+    }
+
+    return h;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.chartboost.unity.utilities",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "displayName": "Chartboost Utilities",
   "description": "Reusable Utilities for Chartboost's Unity Projects",
   "unity": "2022.3",
@@ -14,6 +14,6 @@
   "hideInEditor": false,
   "dependencies": {
     "com.unity.nuget.newtonsoft-json": "3.2.1",
-    "com.chartboost.unity.logging": "1.0.0"
+    "com.chartboost.unity.logging": "1.1.0"
   }
 }