From c9c0413c408b5b34aaf0bf3c30eacaf26794fa0f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 4 Jun 2024 17:04:19 +0200 Subject: [PATCH] Ensure Posthog is only used for Element builds. --- .../libraries/core/extensions/BuildMeta.kt | 28 +++++++++++++++++++ .../posthog/PostHogFactory.kt | 4 ++- .../posthog/PosthogAnalyticsProvider.kt | 4 +-- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt new file mode 100644 index 0000000000..b57fca5b65 --- /dev/null +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2024 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.element.android.libraries.core.extensions + +import io.element.android.libraries.core.meta.BuildMeta +import io.element.android.libraries.core.meta.BuildType + +fun BuildMeta.isElement(): Boolean { + return when (buildType) { + BuildType.RELEASE -> applicationId == "io.element.android.x" + BuildType.NIGHTLY -> applicationId == "io.element.android.x.nightly" + BuildType.DEBUG -> applicationId == "io.element.android.x.debug" + } +} diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt index 6c02b8b788..b680225b34 100644 --- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt +++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt @@ -20,6 +20,7 @@ import android.content.Context import com.posthog.PostHogInterface import com.posthog.android.PostHogAndroid import com.posthog.android.PostHogAndroidConfig +import io.element.android.libraries.core.extensions.isElement import io.element.android.libraries.core.meta.BuildMeta import io.element.android.libraries.di.ApplicationContext import javax.inject.Inject @@ -29,7 +30,8 @@ class PostHogFactory @Inject constructor( private val buildMeta: BuildMeta, private val posthogEndpointConfigProvider: PosthogEndpointConfigProvider, ) { - fun createPosthog(): PostHogInterface { + fun createPosthog(): PostHogInterface? { + if (!buildMeta.isElement()) return null val endpoint = posthogEndpointConfigProvider.provide() return PostHogAndroid.with( context, diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt index 6b81f0d758..f17d25bc85 100644 --- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt +++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt @@ -47,7 +47,7 @@ class PosthogAnalyticsProvider @Inject constructor( private val userPropertiesLock = Any() override fun init() { - posthog = createPosthog() + posthog = postHogFactory.createPosthog() posthog?.optIn() // Timber.e("PostHog distinctId: ${posthog?.distinctId()}") identifyPostHog() @@ -108,8 +108,6 @@ class PosthogAnalyticsProvider @Inject constructor( // Not implemented } - private fun createPosthog(): PostHogInterface = postHogFactory.createPosthog() - private fun identifyPostHog() { val id = analyticsId ?: return if (id.isEmpty()) {