Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions android/src/main/java/com/mindboxsdk/MindboxSdkModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ class MindboxSdkModule(private val reactContext: ReactApplicationContext) : Reac
if (payload.has("operationsDomain")) {
configurationBuilder.operationsDomain(payload.optString("operationsDomain", ""))
}
if (payload.has("shouldIncludeVersionCode")) {
configurationBuilder.shouldIncludeVersionCode(payload.optBoolean("shouldIncludeVersionCode", true))
}
val configuration = configurationBuilder.build()

val handler = Handler(context.mainLooper)
Expand Down
31 changes: 31 additions & 0 deletions src/__tests__/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,37 @@ describe('Testing Mindbox RN SDK', () => {
expect(JSON.parse(calledWith)).not.toHaveProperty('operationsDomain')
})

it('initialize passes shouldIncludeVersionCode to native when provided', async () => {
const {
NativeModules: { MindboxSdk: MindboxSdkNative },
} = require('react-native')
const MindboxSdk = require('../index').default

expect.assertions(1)

await MindboxSdk.initialize({
...initializationData,
shouldIncludeVersionCode: false,
})

const calledWith = (MindboxSdkNative.initialize as jest.Mock).mock.calls.slice(-1)[0][0]
expect(JSON.parse(calledWith)).toMatchObject({ shouldIncludeVersionCode: false })
})

it('initialize does not include shouldIncludeVersionCode in payload when not provided', async () => {
const {
NativeModules: { MindboxSdk: MindboxSdkNative },
} = require('react-native')
const MindboxSdk = require('../index').default

expect.assertions(1)

await MindboxSdk.initialize(initializationData)

const calledWith = (MindboxSdkNative.initialize as jest.Mock).mock.calls.slice(-1)[0][0]
expect(JSON.parse(calledWith)).not.toHaveProperty('shouldIncludeVersionCode')
})

it('getDeviceUUID method works correctly', async () => {
const MindboxSdk = require('../index').default

Expand Down
7 changes: 6 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class MindboxSdkClass {
* previousInstallId: '',
* previousUuid: '',
* operationsDomain: 'anonymizer.example.com',
* shouldIncludeVersionCode: false, // Android only (ignored on iOS). Default value is true
* });
*/
public async initialize(initializationData: InitializationData) {
Expand All @@ -98,7 +99,7 @@ class MindboxSdkClass {
throw new Error('Wrong initialization data!')
}

const { domain, endpointId, subscribeCustomerIfCreated, shouldCreateCustomer, previousInstallId, previousUuid, operationsDomain } = initializationData
const { domain, endpointId, subscribeCustomerIfCreated, shouldCreateCustomer, previousInstallId, previousUuid, operationsDomain, shouldIncludeVersionCode } = initializationData

if (!domain || !endpointId) {
this._initializing = false
Expand Down Expand Up @@ -130,6 +131,10 @@ class MindboxSdkClass {
payload.operationsDomain = operationsDomain
}

if (typeof shouldIncludeVersionCode !== 'undefined') {
payload.shouldIncludeVersionCode = shouldIncludeVersionCode
}

try {
const payloadString = JSON.stringify(payload)
this._initialized = await MindboxSdkNative.initialize(payloadString)
Expand Down
6 changes: 6 additions & 0 deletions src/types/InitializationData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ export type InitializationData = {
previousInstallId?: string
previousUuid?: string
operationsDomain?: string
/**
* Android only, ignored on iOS. Specifies whether the app versionCode is included
* in the app version reported to Mindbox. When false, only versionName is reported.
* Default value is true.
*/
shouldIncludeVersionCode?: boolean
}