Skip to content

Commit 1e6dac6

Browse files
committed
rename dismissMessageOnBackPress to dismissMessageOnBackPressForAndroid
1 parent ff8b80c commit 1e6dac6

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

android/src/main/java/com/sourcepoint/reactnativecmp/ReactNativeCmpModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
6767
}.build()
6868

6969
reactApplicationContext.currentActivity?.let {
70-
spConsentLib = makeConsentLib(config, it, this, parsedOptions.dismissMessageOnBackPress)
70+
spConsentLib = makeConsentLib(config, it, this, parsedOptions.dismissMessageOnBackPressForAndroid)
7171
} ?: run {
7272
onError(Error("No activity found when building the SDK"))
7373
}

android/src/main/java/com/sourcepoint/reactnativecmp/arguments/Arguments.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@ fun ReadableMap.getDoubleOrNull(name: String) =
168168
null
169169
}
170170

171+
fun ReadableMap.getBooleanOrNull(name: String) =
172+
if (hasKey(name) && !isNull(name)) {
173+
getBoolean(name)
174+
} else {
175+
null
176+
}
177+
171178
inline fun <reified T> ReadableArray.toList(): List<T> = List(size()) {
172179
when (T::class) {
173180
String::class -> getString(it)

android/src/main/java/com/sourcepoint/reactnativecmp/arguments/BuildOptions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import com.sourcepoint.cmplibrary.model.MessageLanguage.ENGLISH
77
data class BuildOptions(
88
val language: MessageLanguage,
99
val messageTimeoutInSeconds: Long,
10-
val dismissMessageOnBackPress: Boolean
10+
val dismissMessageOnBackPressForAndroid: Boolean
1111
) {
1212
val messageTimeoutInMilliseconds = messageTimeoutInSeconds * 1000L
1313

1414
constructor(options: ReadableMap?) : this(
1515
language = MessageLanguage.entries.find { it.value == options?.getString("language") } ?: ENGLISH,
1616
messageTimeoutInSeconds = options?.getDoubleOrNull("messageTimeoutInSeconds")?.toLong() ?: 30L,
17-
dismissMessageOnBackPress = if (options?.hasKey("dismissMessageOnBackPress") ?: false) options?.getBoolean("dismissMessageOnBackPress") ?: true else true
17+
dismissMessageOnBackPressForAndroid = options?.getBooleanOrNull("dismissMessageOnBackPressForAndroid") ?: true
1818
)
1919
}

example/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const config = {
3939
messageTimeoutInSeconds: 20,
4040
// Preventing android users from dismissing the consent message on back press
4141
// `true` is the default value, allowing users to dismiss the consent message on back press
42-
dismissMessageOnBackPress: true,
42+
dismissMessageOnBackPressForAndroid: true,
4343
},
4444
gdprPMId: '488393',
4545
usnatPMId: '988851',

src/NativeReactNativeCmp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ export type PreferencesConsent = {
198198
export type SPBuildOptions = {
199199
language?: SPMessageLanguage;
200200
messageTimeoutInSeconds?: number;
201-
dismissMessageOnBackPress?: boolean;
201+
dismissMessageOnBackPressForAndroid?: boolean;
202202
}
203203

204204
export interface Spec extends TurboModule {

0 commit comments

Comments
 (0)