From abdacb4cbf9e0578122e18a33a35367ec11b7ffd Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Thu, 24 Jul 2025 16:57:33 -0400 Subject: [PATCH 1/2] fix: Print domain mapping logs only once per session --- .../com/mparticle/networking/NetworkOptions.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java b/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java index 195f95a68..badb4a2a5 100644 --- a/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java +++ b/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java @@ -20,12 +20,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.HashSet; +import java.util.Set; public class NetworkOptions { Map domainMappings = new HashMap(); boolean pinningDisabledInDevelopment = false; boolean pinningDisabled = false; + private static Set loggedDomainTypes = new HashSet<>(); private NetworkOptions() { } @@ -144,10 +147,13 @@ public Builder addDomainMapping(@Nullable DomainMapping domain) { domainMappings = new HashMap(); } if (domainMappings.containsKey(domain.getType())) { - try { - Logger.warning("Duplicate DomainMapping submitted, DomainMapping:\n" + domain.toJson().toString(4) + "\n will overwrite DomainMapping:\n" + domain.toJson().toString(4)); - } catch (JSONException e) { - e.printStackTrace(); + if (!loggedDomainTypes.contains(domain.getType())) { + try { + Logger.warning("Duplicate DomainMapping submitted, DomainMapping:\n" + domain.toJson().toString(4) + "\n will overwrite DomainMapping:\n" + domain.toJson().toString(4)); + loggedDomainTypes.add(domain.getType()); + } catch (JSONException e) { + e.printStackTrace(); + } } } if (domain.getType() == EVENTS && !domain.isEventsOnly() && !domainMappings.containsKey(ALIAS)) { From b10f277c947aabfc723dc53ee9e20af276050192 Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Mon, 28 Jul 2025 10:56:24 -0400 Subject: [PATCH 2/2] fix error message printing --- .../src/main/java/com/mparticle/networking/NetworkOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java b/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java index badb4a2a5..5d76c32eb 100644 --- a/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java +++ b/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java @@ -152,7 +152,7 @@ public Builder addDomainMapping(@Nullable DomainMapping domain) { Logger.warning("Duplicate DomainMapping submitted, DomainMapping:\n" + domain.toJson().toString(4) + "\n will overwrite DomainMapping:\n" + domain.toJson().toString(4)); loggedDomainTypes.add(domain.getType()); } catch (JSONException e) { - e.printStackTrace(); + Logger.error(e); } } }