From d69211d8ec0259d44e8bdbbaac080bb0da0bf076 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Mon, 14 Oct 2024 20:22:36 +0200 Subject: [PATCH 1/2] fix: only tries to read device context from react-native-device-info if expo libs are not available --- posthog-react-native/CHANGELOG.md | 2 ++ posthog-react-native/src/native-deps.tsx | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/posthog-react-native/CHANGELOG.md b/posthog-react-native/CHANGELOG.md index 384deeb5..eefb926b 100644 --- a/posthog-react-native/CHANGELOG.md +++ b/posthog-react-native/CHANGELOG.md @@ -1,5 +1,7 @@ # Next +1. fix: only tries to read device context from react-native-device-info if expo libs are not available + # 3.3.4 - 2024-10-14 1. fix: only log messages if debug is enabled diff --git a/posthog-react-native/src/native-deps.tsx b/posthog-react-native/src/native-deps.tsx index 6046f1f5..21b2f9a1 100644 --- a/posthog-react-native/src/native-deps.tsx +++ b/posthog-react-native/src/native-deps.tsx @@ -25,6 +25,11 @@ export const getAppProperties = (): PostHogCustomAppProperties => { properties.$app_name = OptionalExpoApplication.applicationName properties.$app_namespace = OptionalExpoApplication.applicationId properties.$app_version = OptionalExpoApplication.nativeApplicationVersion + } else if (OptionalReactNativeDeviceInfo) { + properties.$app_build = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getBuildNumber()) + properties.$app_name = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getApplicationName()) + properties.$app_namespace = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getBundleId()) + properties.$app_version = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getVersion()) } if (OptionalExpoDevice) { @@ -33,18 +38,7 @@ export const getAppProperties = (): PostHogCustomAppProperties => { properties.$device_name = OptionalExpoDevice.modelName properties.$os_name = OptionalExpoDevice.osName properties.$os_version = OptionalExpoDevice.osVersion - } - - if (OptionalExpoLocalization) { - properties.$locale = OptionalExpoLocalization.locale - properties.$timezone = OptionalExpoLocalization.timezone - } - - if (OptionalReactNativeDeviceInfo) { - properties.$app_build = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getBuildNumber()) - properties.$app_name = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getApplicationName()) - properties.$app_namespace = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getBundleId()) - properties.$app_version = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getVersion()) + } else if (OptionalReactNativeDeviceInfo) { properties.$device_manufacturer = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getManufacturerSync()) // react-native-device-info already maps the device model identifier to a human readable name properties.$device_name = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getModel()) @@ -52,6 +46,11 @@ export const getAppProperties = (): PostHogCustomAppProperties => { properties.$os_version = returnPropertyIfNotUnknown(OptionalReactNativeDeviceInfo.getSystemVersion()) } + if (OptionalExpoLocalization) { + properties.$locale = OptionalExpoLocalization.locale + properties.$timezone = OptionalExpoLocalization.timezone + } + return properties } From bffaefef28f620a7d1c0856ce0ee96db9ef26d4a Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Mon, 14 Oct 2024 20:23:23 +0200 Subject: [PATCH 2/2] fix --- posthog-react-native/CHANGELOG.md | 2 ++ posthog-react-native/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/posthog-react-native/CHANGELOG.md b/posthog-react-native/CHANGELOG.md index eefb926b..9a064bda 100644 --- a/posthog-react-native/CHANGELOG.md +++ b/posthog-react-native/CHANGELOG.md @@ -1,5 +1,7 @@ # Next +# 3.3.5 - 2024-10-15 + 1. fix: only tries to read device context from react-native-device-info if expo libs are not available # 3.3.4 - 2024-10-14 diff --git a/posthog-react-native/package.json b/posthog-react-native/package.json index 763c2aad..caf65ce1 100644 --- a/posthog-react-native/package.json +++ b/posthog-react-native/package.json @@ -1,6 +1,6 @@ { "name": "posthog-react-native", - "version": "3.3.4", + "version": "3.3.5", "main": "lib/posthog-react-native/index.js", "files": [ "lib/"