Skip to content

Commit 82bf408

Browse files
committed
Rename Android component to org.rustls.platformverifier
This is more consistent with other Android libraries
1 parent 19d5304 commit 82bf408

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package rustls.platformverifier.android
1+
package org.rustls.platformverifier
22

33
import android.content.Context
44
import androidx.test.ext.junit.runners.AndroidJUnit4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="rustls.platformverifier.android"/>
3+
package="org.rustls.platformverifier"/>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package rustls.platformverifier.android
1+
package org.rustls.platformverifier
22

33
import android.content.Context
44
import android.net.http.X509TrustManagerExtensions

src/tests/ffi.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,14 @@ mod android {
3636
) -> JString<'a> {
3737
// These can't fail, and even if they did, Android will crash the process like we want.
3838
ANDROID_INIT.call_once(|| {
39+
let log_filter = android_logger::FilterBuilder::new()
40+
.filter_module("jni", log::LevelFilter::Off)
41+
.build();
42+
3943
android_logger::init_once(
40-
android_logger::Config::default().with_min_level(log::Level::Trace),
44+
android_logger::Config::default()
45+
.with_min_level(log::Level::Trace)
46+
.with_filter(log_filter),
4147
);
4248
crate::android::init_hosted(env, cx).unwrap();
4349
std::panic::set_hook(Box::new(|info| {
@@ -76,7 +82,7 @@ mod android {
7682
.unwrap()
7783
}
7884

79-
#[export_name = "Java_rustls_platformverifier_android_CertificateVerifierTests_mockTests"]
85+
#[export_name = "Java_org_rustls_platformverifier_CertificateVerifierTests_mockTests"]
8086
pub extern "C" fn rustls_platform_verifier_mock_test_suite(
8187
env: JNIEnv,
8288
_class: JClass,
@@ -93,7 +99,7 @@ mod android {
9399
.into_inner()
94100
}
95101

96-
#[export_name = "Java_rustls_platformverifier_android_CertificateVerifierTests_verifyMockRootUsage"]
102+
#[export_name = "Java_org_rustls_platformverifier_CertificateVerifierTests_verifyMockRootUsage"]
97103
pub extern "C" fn rustls_platform_verifier_verify_mock_root_usage(
98104
env: JNIEnv,
99105
_class: JClass,
@@ -110,7 +116,7 @@ mod android {
110116
.into_inner()
111117
}
112118

113-
#[export_name = "Java_rustls_platformverifier_android_CertificateVerifierTests_realWorldTests"]
119+
#[export_name = "Java_org_rustls_platformverifier_CertificateVerifierTests_realWorldTests"]
114120
pub extern "C" fn rustls_platform_verifier_real_world_test_suite(
115121
env: JNIEnv,
116122
_class: JClass,

src/verification/android.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::android::{with_context, CachedClass};
1212
use crate::verification::invalid_certificate;
1313

1414
static CERT_VERIFIER_CLASS: CachedClass =
15-
CachedClass::new("rustls/platformverifier/android/CertificateVerifier");
15+
CachedClass::new("org/rustls/platformverifier/CertificateVerifier");
1616

1717
// Find the `ByteArray (Uint8 [])` class.
1818
static BYTE_ARRAY_CLASS: CachedClass = CachedClass::new("[B");
@@ -157,7 +157,7 @@ impl Verifier {
157157
'J',
158158
"[[B",
159159
')',
160-
"Lrustls/platformverifier/android/VerificationResult;"
160+
"Lorg/rustls/platformverifier/VerificationResult;"
161161
);
162162

163163
let result = env

0 commit comments

Comments
 (0)