Skip to content

Commit 8eaa837

Browse files
committed
Add JvmStatic annotations for certain static methods to be callable from Java
1 parent 3eebc43 commit 8eaa837

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

OpacityCore/src/main/java/com/opacitylabs/opacitycore/CryptoManager.kt renamed to OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/CryptoManager.kt

File renamed without changes.

OpacityCore/src/main/java/com/opacitylabs/opacitycore/InAppBrowserActivity.kt renamed to OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/InAppBrowserActivity.kt

File renamed without changes.

OpacityCore/src/main/java/com/opacitylabs/opacitycore/JsonUtils.kt renamed to OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/JsonUtils.kt

File renamed without changes.

OpacityCore/src/main/java/com/opacitylabs/opacitycore/OpacityCore.kt renamed to OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/OpacityCore.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import android.os.Bundle
66
import androidx.localbroadcastmanager.content.LocalBroadcastManager
77
import kotlinx.coroutines.Dispatchers
88
import kotlinx.coroutines.withContext
9-
import org.mozilla.geckoview.GeckoRuntime
109
import kotlinx.serialization.*
1110
import kotlinx.serialization.json.*
11+
import org.mozilla.geckoview.GeckoRuntime
1212

1313
object OpacityCore {
1414
enum class Environment {
@@ -28,10 +28,12 @@ object OpacityCore {
2828
System.loadLibrary("OpacityCore")
2929
}
3030

31+
@JvmStatic
3132
fun initialize(apiKey: String, dryRun: Boolean, environment: Environment): Int {
3233
return init(apiKey, dryRun, environment.ordinal)
3334
}
3435

36+
@JvmStatic
3537
fun setContext(context: Context) {
3638
appContext = context
3739
sRuntime = GeckoRuntime.create(appContext.applicationContext)
@@ -65,8 +67,8 @@ object OpacityCore {
6567
fun presentBrowser() {
6668
val intent = Intent()
6769
intent.setClassName(
68-
appContext.packageName,
69-
"com.opacitylabs.opacitycore.InAppBrowserActivity"
70+
appContext.packageName,
71+
"com.opacitylabs.opacitycore.InAppBrowserActivity"
7072
)
7173
intent.putExtra("url", _url)
7274
intent.putExtra("headers", headers)
@@ -99,16 +101,19 @@ object OpacityCore {
99101
}
100102
}
101103

104+
@JvmStatic
102105
suspend fun get(name: String, params: Map<String, Any>?): Map<String, Any> {
103106
return withContext(Dispatchers.IO) {
104107
val paramsString = params?.let { Json.encodeToString(it) }
105108
val res = getNative(name, paramsString)
106-
if(res.status != 0) {
109+
if (res.status != 0) {
107110
throw Exception(res.err)
108111
}
109112

110-
val map: Map<String, Any> = Json.parseToJsonElement(res.data!!).jsonObject
111-
.mapValues { parseJsonElementToAny(it.value) }
113+
val map: Map<String, Any> =
114+
Json.parseToJsonElement(res.data!!).jsonObject.mapValues {
115+
parseJsonElementToAny(it.value)
116+
}
112117
map
113118
}
114119
}

OpacityCore/src/main/java/com/opacitylabs/opacitycore/OpacityResponse.kt renamed to OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/OpacityResponse.kt

File renamed without changes.

app/src/main/java/com/opacitylabs/opacitycoreexample/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class MainActivity : ComponentActivity() {
108108
val opacityApiKey = dotenv["OPACITY_API_KEY"]
109109
requireNotNull(opacityApiKey) { "Opacity API key is null" }
110110

111-
OpacityCore.initialize(opacityApiKey, false, OpacityCore.Environment.TEST)
111+
OpacityCore.initialize(opacityApiKey, false, OpacityCore.Environment.PRODUCTION)
112112
OpacityCore.setContext(this)
113113
}
114114
}

0 commit comments

Comments
 (0)