Skip to content

Commit 5846ad8

Browse files
nursingularnursingular
authored
Merge pull request #25 from singular-labs/rc/5.4.0
RC-5.4.0
2 parents 647917c + bf63c97 commit 5846ad8

File tree

10 files changed

+145
-26
lines changed

10 files changed

+145
-26
lines changed

‎SingularSDK/Editor/SingularSDKDependencies.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dependencies>
22
<androidPackages>
3-
<androidPackage spec="com.singular.sdk:singular_sdk:12.7.2">
3+
<androidPackage spec="com.singular.sdk:singular_sdk:12.9.0">
44
<repositories>
55
<repository>https://maven.singular.net</repository>
66
</repositories>
@@ -10,7 +10,7 @@
1010
<androidPackage spec="com.google.android.gms:play-services-ads-identifier:18.0.1"> </androidPackage>
1111
</androidPackages>
1212
<iosPods>
13-
<iosPod name="Singular-SDK" version="12.7.1" minTargetSdk="12.0" bitcodeEnabled="false" addToAllTargets="false">
13+
<iosPod name="Singular-SDK" version="12.8.0" minTargetSdk="12.0" bitcodeEnabled="false" addToAllTargets="false">
1414
</iosPod>
1515
</iosPods>
1616
</dependencies>

‎SingularSDK/Plugins/Android/SingularUnityBridge-6.11.0.jar‎

17.9 KB
Binary file not shown.

‎SingularSDK/Plugins/Android/SingularUnityBridge-6.9.1.jar.meta‎ renamed to ‎SingularSDK/Plugins/Android/SingularUnityBridge-6.11.0.jar.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SingularSDK/Plugins/Android/SingularUnityBridge-6.9.1.jar‎

-15.2 KB
Binary file not shown.

‎SingularSDK/Plugins/iOS/SingularUnityWrapper.mm‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ bool StartSingularSession_(const char* configString){
141141
withSecret:apiSecret
142142
andHandler:singularLinkHandler
143143
withTimeout:shortlinkResolveTimeout];
144-
145-
NSDictionary* globalProperties = [config objectForKey:@"globalProperties"];
146144

147145
SingularConfig* singularConfig = [[SingularConfig alloc] initWithApiKey:apiKey andSecret:apiSecret];
148146
singularConfig.shortLinkResolveTimeOut = shortlinkResolveTimeout;
@@ -161,6 +159,7 @@ bool StartSingularSession_(const char* configString){
161159
handleConversionValuesUpdated(conversionValue ? [conversionValue intValue] : -1, coarse ? [coarse intValue] : -1, lock);
162160
};
163161

162+
NSDictionary* globalProperties = [config objectForKey:@"globalProperties"];
164163
if ([globalProperties count] > 0){
165164
for (NSDictionary* property in [globalProperties allValues]) {
166165
NSString* propertyKey = [property objectForKey:@"Key"];
@@ -197,7 +196,17 @@ bool StartSingularSession_(const char* configString){
197196
sendSdkMessage("SingularDidSetSdid", result);
198197
};
199198

200-
singularConfig.limitedIdentifiersEnabled = [[config objectForKey:@"limitedIdentifiersEnabled"] boolValue];
199+
NSArray *pushLinkPaths = [config objectForKey:@"pushNotificationLinkPath"];
200+
if (pushLinkPaths && pushLinkPaths.count > 0) {
201+
singularConfig.pushNotificationLinkPath = pushLinkPaths;
202+
}
203+
204+
singularConfig.limitAdvertisingIdentifiers = [[config objectForKey:@"limitAdvertisingIdentifiers"] boolValue];
205+
206+
NSArray *brandedDomains = [config objectForKey:@"brandedDomains"];
207+
if (brandedDomains && brandedDomains.count > 0) {
208+
singularConfig.brandedDomains = brandedDomains;
209+
}
201210

202211
[Singular start:singularConfig];
203212

@@ -332,6 +341,16 @@ void SetAllowAutoIAPComplete_(bool allowed){
332341
[Singular setAllowAutoIAPComplete:b];
333342
}
334343

344+
void HandlePushNotification_(const char* payloadJson) {
345+
NSError *error;
346+
NSDictionary *pushPayloadDictionary = [NSJSONSerialization JSONObjectWithData:[[NSString stringWithUTF8String:payloadJson]
347+
dataUsingEncoding:NSUTF8StringEncoding] options:0 error:&error];
348+
if (error) { return; }
349+
if (pushPayloadDictionary.allKeys.count == 0) { return; }
350+
351+
[Singular handlePushNotification:pushPayloadDictionary];
352+
}
353+
335354
void SetBatchesEvents_(bool setBatches){
336355
BOOL b = setBatches ? YES : NO;
337356
[Singular setBatchesEvents:b];
@@ -486,6 +505,10 @@ void LimitDataSharing_(bool limitDataSharingValue) {
486505
bool GetLimitDataSharing_() {
487506
return [Singular getLimitDataSharing];
488507
}
508+
509+
void SetLimitAdvertisingIdentifiers_(bool isEnabled) {
510+
[Singular setLimitAdvertisingIdentifiers:isEnabled];
511+
}
489512

490513
/* Global Properties */
491514

‎SingularSDK/Runtime/SingularSDK.asmdef‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"autoReferenced": true,
1313
"defineConstraints": [],
1414
"versionDefines": [
15-
{
16-
"name": "com.unity.purchasing",
17-
"expression": "",
18-
"define": "SINGULAR_SDK_IAP_ENABLED"
19-
}
20-
],
15+
{
16+
"name": "com.unity.purchasing",
17+
"expression": "",
18+
"define": "SINGULAR_SDK_IAP_ENABLED"
19+
}
20+
],
2121
"noEngineReferences": false
2222
}

‎SingularSDK/Runtime/SingularSDK.cs‎

Lines changed: 84 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class SingularSDK : MonoBehaviour
1818
{
1919
#region SDK properties
2020

21-
// init:
21+
#region init properties
2222
public string SingularAPIKey = "<YourAPIKey>";
2323
public string SingularAPISecret = "<YourAPISecret>";
2424
public bool InitializeOnAwake = true;
@@ -30,17 +30,20 @@ public class SingularSDK : MonoBehaviour
3030
public static bool Initialized { get; private set; } = false;
3131

3232
private const string UNITY_WRAPPER_NAME = "Unity";
33-
private const string UNITY_VERSION = "5.3.2";
33+
private const string UNITY_VERSION = "5.4.0";
3434

35-
// ios-only:
35+
#endregion // init properties
36+
37+
#region iOS-only
3638
[Obsolete]
3739
public bool autoIAPComplete = false;
3840
public bool clipboardAttribution = false;
3941
public bool SKANEnabled = true;
4042
public bool manualSKANConversionManagement = false;
4143
public int waitForTrackingAuthorizationWithTimeoutInterval = 0;
44+
#endregion // iOS-only
4245

43-
// android-only:
46+
#region Android-only
4447
public static string fcmDeviceToken = null;
4548
public string facebookAppId;
4649
public bool collectOAID = false;
@@ -54,14 +57,15 @@ public class SingularSDK : MonoBehaviour
5457

5558
static bool status = false;
5659
#endif
60+
#endregion //Android-only
5761

58-
// cross-os:
62+
#region Cross-platform
5963
private Dictionary<string, SingularGlobalProperty> globalProperties = new Dictionary<string, SingularGlobalProperty>();
6064
private static bool? limitDataSharing = null;
6165
private static string customUserId;
62-
public bool limitedIdentifiersEnabled = false;
66+
public bool limitAdvertisingIdentifiers = false;
6367

64-
// deep links:
68+
#region Deeplinks
6569
public long ddlTimeoutSec = 0; // default value (0) sets to default timeout (60s)
6670
public long sessionTimeoutSec = 0; // default value (0) sets to default timeout (60s)
6771
public long shortlinkResolveTimeout = 0; // default value (0) sets to default timeout (10s)
@@ -75,27 +79,42 @@ public class SingularSDK : MonoBehaviour
7579
private Int32 resolvedSingularLinkTime;
7680
static Int32 cachedDDLMessageTime;
7781
static string cachedDDLMessage;
82+
#endregion // Deeplinks
7883

79-
// session management:
84+
#region Session management
8085
public static bool endSessionOnGoingToBackground = false;
8186
public static bool restartSessionOnReturningToForeground = false;
87+
#endregion // Session management
8288

83-
// admon/batching:
89+
#region Admom/batching
8490
public static bool batchEvents = false;
8591
private const string ADMON_REVENUE_EVENT_NAME = "__ADMON_USER_LEVEL_REVENUE__";
92+
#endregion // Admon/batching
8693

87-
// SDID:
94+
#region SDID
8895
public static string CustomSdid;
96+
#endregion // SDID
97+
98+
#region Push Notifications
99+
public string[] pushNotificationsLinkPaths;
100+
#endregion // Push Notifications
101+
102+
#region Branded Domains
103+
public string[] brandedDomains;
104+
#endregion // Branded Domains
89105

90-
// handlers and callbacks:
106+
#region Handlers and Callbacks
91107
public static SingularLinkHandler registeredSingularLinkHandler = null;
92108
public static SingularDeferredDeepLinkHandler registeredDDLHandler = null;
93109
public static SingularConversionValueUpdatedHandler registeredConversionValueUpdatedHandler = null;
94110
public static SingularConversionValuesUpdatedHandler registeredConversionValuesUpdatedHandler = null;
95111
public static SingularDeviceAttributionCallbackHandler registeredDeviceAttributionCallbackHandler = null;
96112
public static SingularSdidAccessorHandler registeredSdidAccessorHandler = null;
113+
#endregion // Handlers and Callbacks
97114

98-
#endregion
115+
#endregion // Cross-platform
116+
117+
#endregion // SDK properties
99118

100119
// The Singular SDK is initialized here
101120
void Awake()
@@ -178,7 +197,9 @@ private static SingularConfig BuildSingularConfig()
178197
config.SetValue("globalProperties", instance.globalProperties);
179198
config.SetValue("sessionTimeoutSec", instance.sessionTimeoutSec);
180199
config.SetValue("customSdid", CustomSdid);
181-
config.SetValue("limitedIdentifiersEnabled", instance.limitedIdentifiersEnabled);
200+
config.SetValue("pushNotificationLinkPath", Utilities.DelimitedStringsArrayToArrayOfArrayOfString(instance.pushNotificationsLinkPaths, '/'));
201+
config.SetValue("limitAdvertisingIdentifiers", instance.limitAdvertisingIdentifiers);
202+
config.SetValue("brandedDomains", instance.brandedDomains);
182203
#if UNITY_ANDROID
183204
config.SetValue("facebookAppId", instance.facebookAppId);
184205
config.SetValue("customUserId", customUserId);
@@ -298,6 +319,9 @@ private enum NSType
298319
[DllImport("__Internal")]
299320
private static extern void SetAllowAutoIAPComplete_(bool allowed);
300321

322+
[DllImport("__Internal")]
323+
private static extern void HandlePushNotification_(string payloadJson);
324+
301325
[DllImport("__Internal")]
302326
private static extern void SetBatchesEvents_(bool allowed);
303327

@@ -425,6 +449,9 @@ private enum NSType
425449
[DllImport("__Internal")]
426450
private static extern bool GetLimitDataSharing_();
427451

452+
[DllImport("__Internal")]
453+
private static extern void SetLimitAdvertisingIdentifiers_(bool isEnabled);
454+
428455
[DllImport("__Internal")]
429456
private static extern void SkanRegisterAppForAdNetworkAttribution_();
430457

@@ -843,6 +870,33 @@ public static void SetAllowAutoIAPComplete(bool allowed)
843870
#endif
844871
}
845872

873+
#region Push Notifications
874+
public static void HandlePushNotification(Dictionary<string, string> pushNotificationPayload)
875+
{
876+
if (Application.isEditor ||
877+
!Initialized ||
878+
!instance)
879+
{
880+
SingularUnityLogger.LogDebug("HandlePushNotification called before Singular SDK initialized. ignoring.");
881+
return;
882+
}
883+
884+
if (pushNotificationPayload == null)
885+
{
886+
SingularUnityLogger.LogDebug("HandlePushNotification called with null. ignoring.");
887+
return;
888+
}
889+
890+
string payloadAsJsonString = JsonConvert.SerializeObject(pushNotificationPayload);
891+
#if UNITY_IOS
892+
HandlePushNotification_(payloadAsJsonString);
893+
#elif UNITY_ANDROID
894+
SingularUnityLogger.LogDebug("SingularSDK HandlePushNotification is an iOS-only API which is not availalbe for Android. skipping.");
895+
#endif
896+
}
897+
898+
#endregion // Push Notifications
899+
846900
void OnApplicationPause(bool paused)
847901
{
848902
if (!Initialized || !instance)
@@ -1657,6 +1711,23 @@ public static bool GetLimitDataSharing()
16571711

16581712
return false;
16591713
}
1714+
1715+
public static void SetLimitAdvertisingIdentifiers(bool isEnabled)
1716+
{
1717+
if (Application.isEditor)
1718+
{
1719+
return;
1720+
}
1721+
#if UNITY_IOS
1722+
SetLimitAdvertisingIdentifiers_(isEnabled);
1723+
#elif UNITY_ANDROID
1724+
if (singular != null)
1725+
{
1726+
singular.CallStatic("setLimitAdvertisingIdentifiers", isEnabled);
1727+
}
1728+
#endif
1729+
}
1730+
16601731

16611732
public static void AdRevenue(SingularAdData adData)
16621733
{

‎SingularSDK/Runtime/Utilities.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
namespace Singular
2+
{
3+
public class Utilities
4+
{
5+
public static string[][] DelimitedStringsArrayToArrayOfArrayOfString(string[] delimitedStringsArray, char delimiter)
6+
{
7+
if (delimitedStringsArray == null || delimitedStringsArray.Length == 0)
8+
{
9+
SingularUnityLogger.LogDebug("push notification paths strings array is null or empty. skipping.");
10+
return null;
11+
}
12+
13+
string[][] arrayOfArrayOfString = new string[delimitedStringsArray.Length][];
14+
for (int i = 0; i < delimitedStringsArray.Length; i++)
15+
{
16+
arrayOfArrayOfString[i] = delimitedStringsArray[i].Split(delimiter);
17+
}
18+
19+
return arrayOfArrayOfString;
20+
}
21+
}
22+
}

‎SingularSDK/Runtime/Utilities.cs.meta‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "singular-unity-package",
3-
"version": "5.3.2",
3+
"version": "5.4.0",
44
"displayName": "Singular",
55
"description": "Singular Unity Package",
66
"type": "library",

0 commit comments

Comments
 (0)