From 0c143bd404aa48d678d6b27fd29b8a82d8b31675 Mon Sep 17 00:00:00 2001 From: Kacper Kluka Date: Fri, 18 Nov 2022 08:18:07 +0100 Subject: [PATCH] Move builder creation log after required fields check --- .../main/java/com/ably/tracking/publisher/PublisherBuilder.kt | 2 +- .../main/java/com/ably/tracking/subscriber/SubscriberBuilder.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/publishing-sdk/src/main/java/com/ably/tracking/publisher/PublisherBuilder.kt b/publishing-sdk/src/main/java/com/ably/tracking/publisher/PublisherBuilder.kt index bb205b27d..3624c73d8 100644 --- a/publishing-sdk/src/main/java/com/ably/tracking/publisher/PublisherBuilder.kt +++ b/publishing-sdk/src/main/java/com/ably/tracking/publisher/PublisherBuilder.kt @@ -74,11 +74,11 @@ internal data class PublisherBuilder( @RequiresPermission(anyOf = [ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION]) override fun start(): Publisher { - logHandler?.v("$TAG Creating a publisher instance") if (isMissingRequiredFields()) { logHandler?.v("$TAG Creating a publisher instance failed due to missing required fields") throw BuilderConfigurationIncompleteException() } + logHandler?.v("$TAG Creating a publisher instance") // All below fields are required and above code checks if they are nulls, so using !! should be safe from NPE return DefaultPublisher( DefaultAbly(connectionConfiguration!!, logHandler), diff --git a/subscribing-sdk/src/main/java/com/ably/tracking/subscriber/SubscriberBuilder.kt b/subscribing-sdk/src/main/java/com/ably/tracking/subscriber/SubscriberBuilder.kt index 3e7ec7caa..159a73e28 100644 --- a/subscribing-sdk/src/main/java/com/ably/tracking/subscriber/SubscriberBuilder.kt +++ b/subscribing-sdk/src/main/java/com/ably/tracking/subscriber/SubscriberBuilder.kt @@ -29,11 +29,11 @@ internal data class SubscriberBuilder( this.copy(logHandler = logHandler) override suspend fun start(): Subscriber { - logHandler?.v("$TAG Creating a subscriber instance") if (isMissingRequiredFields()) { logHandler?.v("$TAG Creating a subscriber instance failed due to missing required fields") throw BuilderConfigurationIncompleteException() } + logHandler?.v("$TAG Creating a subscriber instance") // All below fields are required and above code checks if they are nulls, so using !! should be safe from NPE return DefaultSubscriber( DefaultAbly(connectionConfiguration!!, logHandler),