Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DIA-3263] The fix of no internet issue: Update to new android SDK version #30

Merged
merged 2 commits into from
Jan 30, 2024
Merged

[DIA-3263] The fix of no internet issue: Update to new android SDK version #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da560f
[DIA-3263] Update for new android SDK version
Nevazhnovu Jan 25, 2024
0426bfb
[DIA-3263] Removed redundant imports
Nevazhnovu Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Assets/ConsentManagementProvider/Scripts/json/JsonUnwrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,17 @@ public static SpConsents UnwrapSpConsentsAndroid(string json)
}
catch (Exception ex)
{
throw new ApplicationException("An error occurred during JSON unwrapping.", ex);
throw new ApplicationException("An error occurred during JSON unwrapping." + ex.Message, ex);
}
}

private static SpCcpaConsent UnwrapSpCcpaConsentAndroid(CcpaConsentWrapper wrappedCcpa)
{
if (wrappedCcpa == null)
throw new ArgumentNullException(nameof(wrappedCcpa), "The CCPA consent wrapper cannot be null.");
{
CmpDebugUtil.LogError("The CCPA consent wrapper cannot be null.");
return null;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we want to return null instead of throwing an error? I mean, what do we do with the null value after that is being returned from this function? do we do something to handle this case?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method is a part of unparsing process and I don't mind having the object as null since it is a possible outcome for that object with doesn't break the overall flow. Error handling exists above level in the call tree. The logging is enough for now. Since throwing error triggers entire unparsing process to throw.

}
CcpaConsent unwrapped = new CcpaConsent(
uuid: wrappedCcpa.uuid,
status: wrappedCcpa.status,
Expand Down
4 changes: 4 additions & 0 deletions Assets/ConsentManagementProvider/Scripts/observer/ConsentMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ public static void Broadcast<T>(params object[] list) where T : IConsentEventHan
break;
case nameof(IOnConsentError):
Exception exception= (Exception)list[0];

CmpDebugUtil.LogError("Error message: " + exception.Message);
CmpDebugUtil.LogError("Stack Trace: " + exception.StackTrace);

BroadcastEventDispatcher.Execute<IOnConsentError>(null, (i, d) => i.OnConsentError(exception));
break;
case nameof(IOnConsentUIReady):
Expand Down
2 changes: 1 addition & 1 deletion Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@

<androidPackages>
<!-- <androidPackage spec="org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.3.0" />-->
<androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.2.7" />
<androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.6.0" />
</androidPackages>
</dependencies>
Binary file removed Assets/Plugins/Android/com.sourcepoint.cmplibrary.cmplibrary-7.2.7.aar
View file
Open in desktop
Binary file not shown.
Binary file added Assets/Plugins/Android/com.sourcepoint.cmplibrary.cmplibrary-7.6.0.aar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...oint.cmplibrary.cmplibrary-7.2.7.aar.meta → ...oint.cmplibrary.cmplibrary-7.6.0.aar.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.