Load rustls-platform-verifier

OpacityCore/build.gradle

@@ -64,6 +64,7 @@ dependencies {
     implementation libs.geckoview
     implementation libs.androidx.security.crypto
     implementation libs.kotlinx.serialization.json
+    implementation libs.rustls.platform.verifier
     testImplementation libs.junit
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.androidx.espresso.core

OpacityCore/consumer-rules.pro

@@ -1,2 +1,3 @@
 -keep class com.opacitylabs.opacitycore.** { *; }
--keepclassmembers class com.opacitylabs.opacitycore.** { *; }
+-keepclassmembers class com.opacitylabs.opacitycore.** { *; }
+-keep, includedescriptorclasses class org.rustls.platformverifier.** { *; }

OpacityCore/proguard-rules.pro

@@ -90,4 +90,7 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# Keeps rustls-platform-verifier deps from being stripped
+-keep, includedescriptorclasses class org.rustls.platformverifier.** { *; }

OpacityCore/src/main/cpp/OpacityCore.cpp

@@ -383,14 +383,20 @@ android_get_browser_cookies_for_domain(const char *domain) {
 
 extern "C" JNIEXPORT jint JNICALL
 Java_com_opacitylabs_opacitycore_OpacityCore_init(
-    JNIEnv *env, jobject thiz, jstring api_key, jboolean dry_run,
-    jint environment_enum, jboolean show_errors_in_webview) {
+    JNIEnv *env, jobject thiz, jobject context, jstring api_key,
+    jboolean dry_run, jint environment_enum,
+    jboolean show_errors_in_webview) {
   java_object = env->NewGlobalRef(thiz);
   char *err;
   const char *api_key_str = env->GetStringUTFChars(api_key, nullptr);
+  int android_init_result =
+      opacity_core::android_init((void *)env, (void *)context);
+  __android_log_print(ANDROID_LOG_DEBUG, "OpacityCore",
+                      "android_init_result: %d", android_init_result);
+
   int result = opacity_core::opacity_init(api_key_str, dry_run,
-                                  static_cast<int>(environment_enum),
-                                  show_errors_in_webview, &err);
+                                          static_cast<int>(environment_enum),
+                                          show_errors_in_webview, &err);
   if (result != opacity_core::OPACITY_OK) {
     jclass exceptionClass = env->FindClass("java/lang/Exception");
     env->ThrowNew(exceptionClass, err);

OpacityCore/src/main/jni/include/sdk.h

@@ -166,6 +166,8 @@ extern const int32_t OPACITY_ENVIRONMENT_STAGING;
 
 extern const int32_t OPACITY_ENVIRONMENT_PRODUCTION;
 
+int32_t android_init(void *raw_env, void *raw_context);
+
 int32_t opacity_init(const char *api_key_str,
                      bool dry_run,
                      int32_t backend_environment,

OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/OpacityCore.kt

@@ -46,7 +46,7 @@ object OpacityCore {
         environment: Environment,
         showErrorsInWebView: Boolean
     ): Int {
-        return init(apiKey, dryRun, environment.code, showErrorsInWebView)
+        return init(appContext, apiKey, dryRun, environment.code, showErrorsInWebView)
     }
 
     @JvmStatic
@@ -287,6 +287,7 @@ object OpacityCore {
     }
 
     private external fun init(
+        context: Context,
         apiKey: String,
         dryRun: Boolean,
         environment: Int,

gradle/libs.versions.toml

@@ -41,6 +41,7 @@ kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-
 androidx-espresso-intents = { group = "androidx.test.espresso", name = "espresso-intents", version.ref = "espressoIntents" }
 compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "workRuntimeKtx" }
+rustls-platform-verifier = { group = "rustls", name = "rustls-platform-verifier", version = "latest.release" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

settings.gradle.kts

@@ -20,9 +20,31 @@ dependencyResolutionManagement {
         mavenCentral()
         maven("https://maven.mozilla.org/maven2/")
         maven("https://jitpack.io")
+        maven {
+            url = uri(findRustlsPlatformVerifierMaven())
+            metadataSources.artifact()
+        }
     }
 }
 
+@Suppress("UNCHECKED_CAST")
+fun findRustlsPlatformVerifierMaven(): String {
+    val result = providers.exec {
+        workingDir = File(rootDir, "../")
+        commandLine(
+            "cargo", "metadata", "--format-version", "1",
+            "--filter-platform", "aarch64-linux-android",
+            "--manifest-path", "sdk/Cargo.toml"
+        )
+    }.standardOutput.asText.get()
+
+    val json = groovy.json.JsonSlurper().parseText(result) as Map<String, Any>
+    val packages = json["packages"] as List<Map<String, Any>>
+    val pkg = packages.first { it["name"] == "rustls-platform-verifier-android" }
+    val manifestPath = File(pkg["manifest_path"] as String)
+    return File(manifestPath.parentFile, "maven").path
+}
+
 
 rootProject.name = "OpacityAndroid"
 include(":app")