Some cleanup

dart-lang · Jan 24, 2025 · 5f998a9 · 5f998a9
1 parent a32cbd1
commit 5f998a9
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 979 deletions.
diff --git a/...ain/kotlin/com/example/ok_http/X509Foo.kt → ...tp/FixedResponseX509ExtendedKeyManager.kt b/...ain/kotlin/com/example/ok_http/X509Foo.kt → ...tp/FixedResponseX509ExtendedKeyManager.kt
@@ -7,7 +7,7 @@ import java.security.cert.X509Certificate
 import javax.net.ssl.SSLEngine
 import javax.net.ssl.X509ExtendedKeyManager
 
-class X509Foo(
+class FixedResponseX509ExtendedKeyManager(
         private val certificateChain: Array<X509Certificate>,
         private val privateKey: PrivateKey,
         private val alias: String,

diff --git a/pkgs/ok_http/android/src/main/kotlin/com/example/ok_http/SSLSocketFactoryFoo.kt b/pkgs/ok_http/android/src/main/kotlin/com/example/ok_http/SSLSocketFactoryFoo.kt
diff --git a/pkgs/ok_http/android/src/main/kotlin/com/example/ok_http/SocketFactoryFoo.kt b/pkgs/ok_http/android/src/main/kotlin/com/example/ok_http/SocketFactoryFoo.kt
diff --git a/pkgs/ok_http/android/src/main/kotlin/com/example/ok_http/Verifier.kt b/pkgs/ok_http/android/src/main/kotlin/com/example/ok_http/Verifier.kt
diff --git a/pkgs/ok_http/example/integration_test/certificate_test.dart b/pkgs/ok_http/example/integration_test/certificate_test.dart
@@ -2,13 +2,11 @@ import 'dart:async';
 import 'dart:io' as io;
 import 'dart:typed_data';
 
+import 'package:flutter/services.dart' show rootBundle;
 import 'package:http/http.dart';
-import 'package:http/io_client.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:ok_http/ok_http.dart';
 import 'package:test/test.dart';
-import 'package:flutter/services.dart' show rootBundle;
-import 'package:jni/jni.dart';
 
 Future<Uint8List> loadCertificateBytes(String path) async {
   return (await rootBundle.load(path)).buffer.asUint8List();

diff --git a/pkgs/ok_http/jnigen.yaml b/pkgs/ok_http/jnigen.yaml
@@ -31,10 +31,7 @@ classes:
 - "com.example.ok_http.DataCallback"
 - "okhttp3.WebSocket"
 - "com.example.ok_http.WebSocketListenerProxy"
-- "com.example.ok_http.X509Foo"
-- "com.example.ok_http.Verifier"
-- "com.example.ok_http.SocketFactoryFoo"
-- "com.example.ok_http.SSLSocketFactoryFoo"
+- "com.example.ok_http.FixedResponseX509ExtendedKeyManager"
 - "okio.ByteString"
 - "com.example.ok_http.WebSocketInterceptor"
 - "java.util.concurrent.TimeUnit"