Skip to content

Commit a22fa23

Browse files
Hide more unused symbols
1 parent 2830cc8 commit a22fa23

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

pkgs/jni/lib/_internal.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,13 @@ export 'src/nio/jbuffer.dart' show $JBuffer$NullableType$, $JBuffer$Type$;
6969
export 'src/nio/jbyte_buffer.dart'
7070
show $JByteBuffer$NullableType$, $JByteBuffer$Type$;
7171
export 'src/third_party/generated_bindings.dart'
72-
show JFieldIDPtr, JMethodIDPtr, JObjectPtr, JThrowablePtr, JniResult;
72+
show
73+
Dart_FinalizableHandle,
74+
JFieldIDPtr,
75+
JMethodIDPtr,
76+
JObjectPtr,
77+
JThrowablePtr,
78+
JniResult;
7379
export 'src/types.dart' show JTypeBase, lowestCommonSuperType, referenceType;
7480
export 'src/util/jiterator.dart'
7581
show $JIterator$NullableType$, $JIterator$Type$;

pkgs/jni/lib/jni.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ export 'src/jarray.dart'
8484
$JShortArray$NullableType$,
8585
$JShortArray$Type$;
8686
export 'src/jimplementer.dart';
87-
export 'src/jni.dart' hide ProtectedJniExtensions, StringMethodsForJni;
87+
export 'src/jni.dart'
88+
hide InternalJniExtension, ProtectedJniExtensions, StringMethodsForJni;
8889
export 'src/jobject.dart' hide $JObject$NullableType$, $JObject$Type$;
8990
export 'src/jreference.dart' hide ProtectedJReference;
9091
export 'src/jvalues.dart';

pkgs/jni/lib/src/jni.dart

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,19 @@ extension ProtectedJniExtensions on Jni {
287287
}
288288
}
289289

290+
static Pointer<T> Function<T extends NativeType>(String) get lookup =>
291+
Jni._dylib.lookup;
292+
}
293+
294+
/// Used only inside `package:jni`.
295+
@internal
296+
extension InternalJniExtension on Jni {
290297
static Dart_FinalizableHandle newJObjectFinalizableHandle(
291298
Object object,
292299
Pointer<Void> reference,
293300
JObjectRefType refType,
294301
) {
295-
ensureInitialized();
302+
ProtectedJniExtensions.ensureInitialized();
296303
return Jni._bindings
297304
.newJObjectFinalizableHandle(object, reference, refType);
298305
}
@@ -301,18 +308,15 @@ extension ProtectedJniExtensions on Jni {
301308
Object object,
302309
Pointer<Bool> reference,
303310
) {
304-
ensureInitialized();
311+
ProtectedJniExtensions.ensureInitialized();
305312
return Jni._bindings.newBooleanFinalizableHandle(object, reference);
306313
}
307314

308315
static void deleteFinalizableHandle(
309316
Dart_FinalizableHandle finalizableHandle, Object object) {
310-
ensureInitialized();
317+
ProtectedJniExtensions.ensureInitialized();
311318
Jni._bindings.deleteFinalizableHandle(finalizableHandle, object);
312319
}
313-
314-
static Pointer<T> Function<T extends NativeType>(String) get lookup =>
315-
Jni._dylib.lookup;
316320
}
317321

318322
extension AdditionalEnvMethods on GlobalJniEnv {

pkgs/jni/lib/src/jreference.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ final class JGlobalReference extends JReference {
9292
final finalizable = _JFinalizable(pointer);
9393
final isReleased = calloc<Bool>();
9494
final jobjectFinalizableHandle =
95-
ProtectedJniExtensions.newJObjectFinalizableHandle(
95+
InternalJniExtension.newJObjectFinalizableHandle(
9696
finalizable, finalizable.pointer, JObjectRefType.JNIGlobalRefType);
97-
ProtectedJniExtensions.newBooleanFinalizableHandle(finalizable, isReleased);
97+
InternalJniExtension.newBooleanFinalizableHandle(finalizable, isReleased);
9898
return JGlobalReference._(
9999
finalizable, jobjectFinalizableHandle, isReleased);
100100
}
@@ -108,7 +108,7 @@ final class JGlobalReference extends JReference {
108108
throw DoubleReleaseError();
109109
}
110110
_isReleased.value = true;
111-
ProtectedJniExtensions.deleteFinalizableHandle(
111+
InternalJniExtension.deleteFinalizableHandle(
112112
_jobjectFinalizableHandle, _finalizable);
113113
}
114114

0 commit comments

Comments
 (0)