Skip to content

Commit e23710b

Browse files
uerceguerceg
committed
refac: remove usage of null propagating operator
1 parent e73b46e commit e23710b

File tree

3 files changed

+132
-36
lines changed

3 files changed

+132
-36
lines changed

‎Assets/Adjust/Scripts/AdjustAndroid.cs

+72-18
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,10 @@ public void onAttributionChanged(AndroidJavaObject ajoAttribution)
742742
{
743743
if (ajoAttribution == null)
744744
{
745-
callback?.Invoke(null);
745+
if (callback != null)
746+
{
747+
callback.Invoke(null);
748+
}
746749
return;
747750
}
748751

@@ -773,7 +776,10 @@ public void onAttributionChanged(AndroidJavaObject ajoAttribution)
773776
AdjustUtils.WriteJsonResponseDictionary(jsonResponseNode.AsObject, adjustAttribution.JsonResponse);
774777
}
775778

776-
callback?.Invoke(adjustAttribution);
779+
if (callback != null)
780+
{
781+
callback.Invoke(adjustAttribution);
782+
}
777783
}
778784
catch (Exception)
779785
{
@@ -805,7 +811,10 @@ public bool launchReceivedDeeplink(AndroidJavaObject deeplink)
805811
AdjustThreadDispatcher.RunOnMainThread(() =>
806812
{
807813
string strDeeplink = deeplink != null ? deeplink.Call<string>("toString") : null;
808-
callback?.Invoke(strDeeplink);
814+
if (callback != null)
815+
{
816+
callback.Invoke(strDeeplink);
817+
}
809818
});
810819

811820
return isDeferredDeeplinkOpeningEnabled;
@@ -852,7 +861,10 @@ public void onEventTrackingSucceeded(AndroidJavaObject eventSuccessData)
852861
}
853862
}
854863

855-
callback?.Invoke(adjustEventSuccess);
864+
if (callback != null)
865+
{
866+
callback.Invoke(adjustEventSuccess);
867+
}
856868
}
857869
catch (Exception)
858870
{
@@ -905,7 +917,10 @@ public void onEventTrackingFailed(AndroidJavaObject eventFailureData)
905917
}
906918
}
907919

908-
callback?.Invoke(adjustEventFailure);
920+
if (callback != null)
921+
{
922+
callback.Invoke(adjustEventFailure);
923+
}
909924
}
910925
catch (Exception)
911926
{
@@ -956,7 +971,10 @@ public void onSessionTrackingSucceeded(AndroidJavaObject sessionSuccessData)
956971
}
957972
}
958973

959-
callback?.Invoke(adjustSessionSuccess);
974+
if (callback != null)
975+
{
976+
callback.Invoke(adjustSessionSuccess);
977+
}
960978
}
961979
catch (Exception)
962980
{
@@ -1008,7 +1026,10 @@ public void onSessionTrackingFailed(AndroidJavaObject sessionFailureData)
10081026
}
10091027
}
10101028

1011-
callback?.Invoke(adjustSessionFailure);
1029+
if (callback != null)
1030+
{
1031+
callback.Invoke(adjustSessionFailure);
1032+
}
10121033
}
10131034
catch (Exception)
10141035
{
@@ -1041,7 +1062,10 @@ public void onGoogleAdIdRead(string adid)
10411062

10421063
AdjustThreadDispatcher.RunOnMainThread(() =>
10431064
{
1044-
callback?.Invoke(adid);
1065+
if (callback != null)
1066+
{
1067+
callback.Invoke(adid);
1068+
}
10451069
});
10461070
}
10471071
}
@@ -1071,7 +1095,10 @@ public void onVerificationFinished(AndroidJavaObject ajoVerificationInfo)
10711095
{
10721096
if (ajoVerificationInfo == null)
10731097
{
1074-
callback?.Invoke(null);
1098+
if (callback != null)
1099+
{
1100+
callback.Invoke(null);
1101+
}
10751102
return;
10761103
}
10771104

@@ -1082,7 +1109,10 @@ public void onVerificationFinished(AndroidJavaObject ajoVerificationInfo)
10821109
Message = AdjustUtils.GetValueOrEmptyToNull(ajoVerificationInfo.Get<string>(AdjustUtils.KeyMessage))
10831110
};
10841111

1085-
callback?.Invoke(purchaseVerificationResult);
1112+
if (callback != null)
1113+
{
1114+
callback.Invoke(purchaseVerificationResult);
1115+
}
10861116
}
10871117
catch (Exception)
10881118
{
@@ -1113,7 +1143,10 @@ public void onDeeplinkResolved(string resolvedLink)
11131143

11141144
AdjustThreadDispatcher.RunOnMainThread(() =>
11151145
{
1116-
callback?.Invoke(resolvedLink);
1146+
if (callback != null)
1147+
{
1148+
callback.Invoke(resolvedLink);
1149+
}
11171150
});
11181151
}
11191152
}
@@ -1139,7 +1172,10 @@ public void onAdidRead(string adid)
11391172

11401173
AdjustThreadDispatcher.RunOnMainThread(() =>
11411174
{
1142-
callback?.Invoke(adid);
1175+
if (callback != null)
1176+
{
1177+
callback.Invoke(adid);
1178+
}
11431179
});
11441180
}
11451181
}
@@ -1169,7 +1205,10 @@ public void onAttributionRead(AndroidJavaObject ajoAttribution)
11691205
{
11701206
if (ajoAttribution == null)
11711207
{
1172-
callback?.Invoke(null);
1208+
if (callback != null)
1209+
{
1210+
callback.Invoke(null);
1211+
}
11731212
return;
11741213
}
11751214

@@ -1200,7 +1239,10 @@ public void onAttributionRead(AndroidJavaObject ajoAttribution)
12001239
AdjustUtils.WriteJsonResponseDictionary(jsonResponseNode.AsObject, adjustAttribution.JsonResponse);
12011240
}
12021241

1203-
callback?.Invoke(adjustAttribution);
1242+
if (callback != null)
1243+
{
1244+
callback.Invoke(adjustAttribution);
1245+
}
12041246
}
12051247
catch (Exception)
12061248
{
@@ -1231,7 +1273,10 @@ public void onAmazonAdIdRead(string amazonAdId)
12311273

12321274
AdjustThreadDispatcher.RunOnMainThread(() =>
12331275
{
1234-
callback?.Invoke(amazonAdId);
1276+
if (callback != null)
1277+
{
1278+
callback.Invoke(amazonAdId);
1279+
}
12351280
});
12361281
}
12371282
}
@@ -1259,7 +1304,10 @@ public void onSdkVersionRead(string sdkVersion)
12591304

12601305
AdjustThreadDispatcher.RunOnMainThread(() =>
12611306
{
1262-
callback?.Invoke(this.sdkPrefix + "@" + sdkVersion);
1307+
if (callback != null)
1308+
{
1309+
callback.Invoke(this.sdkPrefix + "@" + sdkVersion);
1310+
}
12631311
});
12641312
}
12651313
}
@@ -1285,7 +1333,10 @@ public void onIsEnabledRead(bool isEnabled)
12851333

12861334
AdjustThreadDispatcher.RunOnMainThread(() =>
12871335
{
1288-
callback?.Invoke(isEnabled);
1336+
if (callback != null)
1337+
{
1338+
callback.Invoke(isEnabled);
1339+
}
12891340
});
12901341
}
12911342
}
@@ -1312,7 +1363,10 @@ public void onLastDeeplinkRead(AndroidJavaObject ajoLastDeeplink)
13121363
AdjustThreadDispatcher.RunOnMainThread(() =>
13131364
{
13141365
string deeplink = ajoLastDeeplink != null ? ajoLastDeeplink.Call<string>("toString") : null;
1315-
callback?.Invoke(deeplink);
1366+
if (callback != null)
1367+
{
1368+
callback.Invoke(deeplink);
1369+
}
13161370
});
13171371
}
13181372
}

‎Assets/Adjust/Scripts/AdjustThreadDispatcher.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ private void Update()
2929
{
3030
action = executionQueue.Dequeue();
3131
}
32-
action?.Invoke();
32+
if (action != null)
33+
{
34+
action.Invoke();
35+
}
3336
}
3437
}
3538

‎Assets/Adjust/Scripts/AdjustiOS.cs

+56-17
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,10 @@ private static void IsEnabledGetterMonoPInvoke(bool isEnabled)
705705
{
706706
foreach (Action<bool> callback in appIsEnabledGetterCallbacks)
707707
{
708-
callback?.Invoke(isEnabled);
708+
if (callback != null)
709+
{
710+
callback.Invoke(isEnabled);
711+
}
709712
}
710713
appIsEnabledGetterCallbacks.Clear();
711714
});
@@ -723,7 +726,10 @@ private static void AttributionGetterMonoPInvoke(string attribution)
723726
{
724727
foreach (Action<AdjustAttribution> callback in appAttributionGetterCallbacks)
725728
{
726-
callback?.Invoke(new AdjustAttribution(attribution));
729+
if (callback != null)
730+
{
731+
callback.Invoke(new AdjustAttribution(attribution));
732+
}
727733
}
728734
appAttributionGetterCallbacks.Clear();
729735
});
@@ -741,7 +747,10 @@ private static void AdidGetterMonoPInvoke(string adid)
741747
{
742748
foreach (Action<string> callback in appAdidGetterCallbacks)
743749
{
744-
callback?.Invoke(adid);
750+
if (callback != null)
751+
{
752+
callback.Invoke(adid);
753+
}
745754
}
746755
appAdidGetterCallbacks.Clear();
747756
});
@@ -759,7 +768,10 @@ private static void IdfaGetterMonoPInvoke(string idfa)
759768
{
760769
foreach (Action<string> callback in appIdfaGetterCallbacks)
761770
{
762-
callback?.Invoke(idfa);
771+
if (callback != null)
772+
{
773+
callback.Invoke(idfa);
774+
}
763775
}
764776
appIdfaGetterCallbacks.Clear();
765777
});
@@ -777,7 +789,10 @@ private static void IdfvGetterMonoPInvoke(string idfv)
777789
{
778790
foreach (Action<string> callback in appIdfvGetterCallbacks)
779791
{
780-
callback?.Invoke(idfv);
792+
if (callback != null)
793+
{
794+
callback.Invoke(idfv);
795+
}
781796
}
782797
appIdfvGetterCallbacks.Clear();
783798
});
@@ -795,7 +810,10 @@ private static void LastDeeplinkGetterMonoPInvoke(string lastDeeplink)
795810
{
796811
foreach (Action<string> callback in appLastDeeplinkGetterCallbacks)
797812
{
798-
callback?.Invoke(lastDeeplink);
813+
if (callback != null)
814+
{
815+
callback.Invoke(lastDeeplink);
816+
}
799817
}
800818
appLastDeeplinkGetterCallbacks.Clear();
801819
});
@@ -813,7 +831,10 @@ private static void SdkVersionGetterMonoPInvoke(string sdkVersion)
813831
{
814832
foreach (Action<string> callback in appSdkVersionGetterCallbacks)
815833
{
816-
callback?.Invoke(sdkPrefix + "@" + sdkVersion);
834+
if (callback != null)
835+
{
836+
callback.Invoke(sdkPrefix + "@" + sdkVersion);
837+
}
817838
}
818839
appSdkVersionGetterCallbacks.Clear();
819840
});
@@ -831,7 +852,10 @@ private static void AttCallbackMonoPInvoke(int status)
831852
{
832853
foreach (Action<int> callback in appAttCallbacks)
833854
{
834-
callback?.Invoke(status);
855+
if (callback != null)
856+
{
857+
callback.Invoke(status);
858+
}
835859
}
836860
appAttCallbacks.Clear();
837861
});
@@ -847,8 +871,11 @@ private static void PurchaseVerificationCallbackMonoPInvoke(string verificationR
847871

848872
AdjustThreadDispatcher.RunOnMainThread(() =>
849873
{
850-
appPurchaseVerificationCallback?.Invoke(new AdjustPurchaseVerificationResult(verificationResult));
851-
appPurchaseVerificationCallback = null;
874+
if (appPurchaseVerificationCallback != null)
875+
{
876+
appPurchaseVerificationCallback.Invoke(new AdjustPurchaseVerificationResult(verificationResult));
877+
appPurchaseVerificationCallback = null;
878+
}
852879
});
853880
}
854881

@@ -862,8 +889,11 @@ private static void VerifyAndTrackCallbackMonoPInvoke(string verificationResult)
862889

863890
AdjustThreadDispatcher.RunOnMainThread(() =>
864891
{
865-
appVerifyAndTrackCallback?.Invoke(new AdjustPurchaseVerificationResult(verificationResult));
866-
appVerifyAndTrackCallback = null;
892+
if (appVerifyAndTrackCallback != null)
893+
{
894+
appVerifyAndTrackCallback.Invoke(new AdjustPurchaseVerificationResult(verificationResult));
895+
appVerifyAndTrackCallback = null;
896+
}
867897
});
868898
}
869899

@@ -877,8 +907,11 @@ private static void ResolvedDeeplinkCallbackMonoPInvoke(string deeplink)
877907

878908
AdjustThreadDispatcher.RunOnMainThread(() =>
879909
{
880-
appResolvedDeeplinkCallback?.Invoke(deeplink);
881-
appResolvedDeeplinkCallback = null;
910+
if (appResolvedDeeplinkCallback != null)
911+
{
912+
appResolvedDeeplinkCallback.Invoke(deeplink);
913+
appResolvedDeeplinkCallback = null;
914+
}
882915
});
883916
}
884917

@@ -892,8 +925,11 @@ private static void SkanErrorCallbackMonoPInvoke(string error)
892925

893926
AdjustThreadDispatcher.RunOnMainThread(() =>
894927
{
895-
appSkanErrorCallback?.Invoke(error);
896-
appSkanErrorCallback = null;
928+
if (appSkanErrorCallback != null)
929+
{
930+
appSkanErrorCallback.Invoke(error);
931+
appSkanErrorCallback = null;
932+
}
897933
});
898934
}
899935

@@ -992,7 +1028,10 @@ private static void SkanUpdatedCallbackMonoPInvoke(string skanData)
9921028

9931029
AdjustThreadDispatcher.RunOnMainThread(() =>
9941030
{
995-
appSkanUpdatedCallback?.Invoke(AdjustUtils.GetSkanUpdateDataDictionary(skanData));
1031+
if (appSkanUpdatedCallback != null)
1032+
{
1033+
appSkanUpdatedCallback.Invoke(AdjustUtils.GetSkanUpdateDataDictionary(skanData));
1034+
}
9961035
});
9971036
}
9981037
}

0 commit comments

Comments
 (0)