Skip to content

In Android module, use reactContext.currentActivity #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmerlet-at-didomi merged 1 commit into from
Sep 23, 2025
Merged

In Android module, use reactContext.currentActivity #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions android/src/main/java/io/didomi/reactnative/DidomiModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
false
)

val application = currentActivity?.application ?: throw IllegalStateException("No activity present")
val application = reactContext.currentActivity?.application ?: throw IllegalStateException("No activity present")
Didomi.getInstance().initialize(application, parameters)

promise.resolve(0)
Expand All @@ -383,7 +383,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava

val parameters = buildDidomiInitializeParameters(jsonParameters)

val application = currentActivity?.application ?: throw IllegalStateException("No activity present")
val application = reactContext.currentActivity?.application ?: throw IllegalStateException("No activity present")
Didomi.getInstance().initialize(application, parameters)

promise.resolve(0)
Expand All @@ -409,7 +409,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
fun setupUI(promise: Promise) {
try {
runOnUiThread {
Didomi.getInstance().setupUI(currentActivity as? FragmentActivity)
Didomi.getInstance().setupUI(reactContext.currentActivity as? FragmentActivity)
}
promise.resolve(0)
} catch (e: Exception) {
Expand Down Expand Up @@ -686,7 +686,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava

@ReactMethod
fun setUserAndSetupUI(organizationUserId: String, promise: Promise) {
Didomi.getInstance().setUser(organizationUserId, currentActivity as? FragmentActivity)
Didomi.getInstance().setUser(organizationUserId, reactContext.currentActivity as? FragmentActivity)
promise.resolve(0)
}

Expand Down Expand Up @@ -728,7 +728,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
digest,
salt
),
activity = currentActivity as? FragmentActivity
activity = reactContext.currentActivity as? FragmentActivity
)
promise.resolve(0)
}
Expand Down Expand Up @@ -775,7 +775,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
salt,
expiration.toLong()
),
activity = currentActivity as? FragmentActivity
activity = reactContext.currentActivity as? FragmentActivity
)
promise.resolve(0)
}
Expand Down Expand Up @@ -814,7 +814,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
secretId,
initializationVector
),
activity = currentActivity as? FragmentActivity
activity = reactContext.currentActivity as? FragmentActivity
)
promise.resolve(0)
}
Expand Down Expand Up @@ -857,7 +857,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
initializationVector,
expiration.toLong()
),
activity = currentActivity as? FragmentActivity
activity = reactContext.currentActivity as? FragmentActivity
)
promise.resolve(0)
}
Expand Down Expand Up @@ -907,7 +907,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
Didomi.getInstance().setUser(
userAuthParams = userAuthParams,
synchronizedUsers = synchronizedUsers,
activity = currentActivity as? FragmentActivity,
activity = reactContext.currentActivity as? FragmentActivity,
)

promise.resolve(0)
Expand Down Expand Up @@ -938,7 +938,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
promise: Promise
) {
try {
val userParameters = buildDidomiUserParameters(JSONObject(jsonUserParameters), currentActivity as? FragmentActivity)
val userParameters = buildDidomiUserParameters(JSONObject(jsonUserParameters), reactContext.currentActivity as? FragmentActivity)

Didomi.getInstance().setUser(userParameters)
promise.resolve(0)
Expand All @@ -952,7 +952,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
fun showNotice(promise: Promise) {
try {
runOnUiThread {
Didomi.getInstance().showNotice(currentActivity as? FragmentActivity)
Didomi.getInstance().showNotice(reactContext.currentActivity as? FragmentActivity)
}
promise.resolve(0)
} catch (e: Exception) {
Expand All @@ -966,8 +966,8 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
try {
runOnUiThread {
view?.also {
Didomi.getInstance().showPreferences(currentActivity as? FragmentActivity, view)
} ?: Didomi.getInstance().showPreferences(currentActivity as? FragmentActivity)
Didomi.getInstance().showPreferences(reactContext.currentActivity as? FragmentActivity, view)
} ?: Didomi.getInstance().showPreferences(reactContext.currentActivity as? FragmentActivity)
}
promise.resolve(0)
} catch (e: Exception) {
Expand Down