Formatted files

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/SslErrorHandlerFlutterApiImpl.java

@@ -16,37 +16,36 @@
  * arguments of callbacks methods to a Dart instance.
  */
 public class SslErrorHandlerFlutterApiImpl {
-    // To ease adding additional methods, this value is added prematurely.
-    @SuppressWarnings({"unused", "FieldCanBeLocal"})
-    private final BinaryMessenger binaryMessenger;
+  // To ease adding additional methods, this value is added prematurely.
+  @SuppressWarnings({"unused", "FieldCanBeLocal"})
+  private final BinaryMessenger binaryMessenger;
 
-    private final InstanceManager instanceManager;
+  private final InstanceManager instanceManager;
 
-    private final SslErrorHandlerFlutterApi api;
+  private final SslErrorHandlerFlutterApi api;
 
-    /**
-     * Constructs a {@link SslErrorHandlerFlutterApiImpl}.
-     *
-     * @param binaryMessenger used to communicate with Dart over asynchronous messages
-     * @param instanceManager maintains instances stored to communicate with attached Dart objects
-     */
-    public SslErrorHandlerFlutterApiImpl(
-            @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
-        this.binaryMessenger = binaryMessenger;
-        this.instanceManager = instanceManager;
-        api = new SslErrorHandlerFlutterApi(binaryMessenger);
-    }
+  /**
+   * Constructs a {@link SslErrorHandlerFlutterApiImpl}.
+   *
+   * @param binaryMessenger used to communicate with Dart over asynchronous messages
+   * @param instanceManager maintains instances stored to communicate with attached Dart objects
+   */
+  public SslErrorHandlerFlutterApiImpl(
+      @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
+    this.binaryMessenger = binaryMessenger;
+    this.instanceManager = instanceManager;
+    api = new SslErrorHandlerFlutterApi(binaryMessenger);
+  }
 
-    /**
-     * Stores the `SslErrorHandler` instance and notifies Dart to create and store a new
-     * `SslErrorHandler` instance that is attached to this one. If `instance` has already been added,
-     * this method does nothing.
-     */
-    public void create(
-            @NonNull SslErrorHandler instance,
-            @NonNull SslErrorHandlerFlutterApi.Reply<Void> callback) {
-        if (!instanceManager.containsInstance(instance)) {
-            api.create(instanceManager.addHostCreatedInstance(instance), callback);
-        }
+  /**
+   * Stores the `SslErrorHandler` instance and notifies Dart to create and store a new
+   * `SslErrorHandler` instance that is attached to this one. If `instance` has already been added,
+   * this method does nothing.
+   */
+  public void create(
+      @NonNull SslErrorHandler instance, @NonNull SslErrorHandlerFlutterApi.Reply<Void> callback) {
+    if (!instanceManager.containsInstance(instance)) {
+      api.create(instanceManager.addHostCreatedInstance(instance), callback);
     }
+  }
 }

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/SslErrorHandlerHostApiImpl.java

@@ -16,35 +16,35 @@
  * <p>Handles creating {@link SslErrorHandler}s that intercommunicate with a paired Dart object.
  */
 public class SslErrorHandlerHostApiImpl implements SslErrorHandlerHostApi {
-    // To ease adding additional methods, this value is added prematurely.
-    @SuppressWarnings({"unused", "FieldCanBeLocal"})
-    private final BinaryMessenger binaryMessenger;
-
-    private final InstanceManager instanceManager;
-
-    /**
-     * Constructs a {@link SslErrorHandlerHostApiImpl}.
-     *
-     * @param binaryMessenger used to communicate with Dart over asynchronous messages
-     * @param instanceManager maintains instances stored to communicate with attached Dart objects
-     */
-    public SslErrorHandlerHostApiImpl(
-            @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
-        this.binaryMessenger = binaryMessenger;
-        this.instanceManager = instanceManager;
-    }
-
-    @Override
-    public void cancel(@NonNull Long instanceId) {
-        getSslErrorHandlerInstance(instanceId).cancel();
-    }
-
-    @Override
-    public void proceed(@NonNull Long instanceId) {
-        getSslErrorHandlerInstance(instanceId).proceed();
-    }
-
-    private SslErrorHandler getSslErrorHandlerInstance(@NonNull Long instanceId) {
-        return Objects.requireNonNull(instanceManager.getInstance(instanceId));
-    }
+  // To ease adding additional methods, this value is added prematurely.
+  @SuppressWarnings({"unused", "FieldCanBeLocal"})
+  private final BinaryMessenger binaryMessenger;
+
+  private final InstanceManager instanceManager;
+
+  /**
+   * Constructs a {@link SslErrorHandlerHostApiImpl}.
+   *
+   * @param binaryMessenger used to communicate with Dart over asynchronous messages
+   * @param instanceManager maintains instances stored to communicate with attached Dart objects
+   */
+  public SslErrorHandlerHostApiImpl(
+      @NonNull BinaryMessenger binaryMessenger, @NonNull InstanceManager instanceManager) {
+    this.binaryMessenger = binaryMessenger;
+    this.instanceManager = instanceManager;
+  }
+
+  @Override
+  public void cancel(@NonNull Long instanceId) {
+    getSslErrorHandlerInstance(instanceId).cancel();
+  }
+
+  @Override
+  public void proceed(@NonNull Long instanceId) {
+    getSslErrorHandlerInstance(instanceId).proceed();
+  }
+
+  private SslErrorHandler getSslErrorHandlerInstance(@NonNull Long instanceId) {
+    return Objects.requireNonNull(instanceManager.getInstance(instanceId));
+  }
 }

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewClientFlutterApiImpl.java

@@ -20,7 +20,6 @@
 import androidx.webkit.WebResourceErrorCompat;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.webviewflutter.GeneratedAndroidWebView.WebViewClientFlutterApi;
-
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
@@ -88,53 +87,53 @@ static GeneratedAndroidWebView.WebResourceResponseData createWebResourceResponse
   }
 
   static GeneratedAndroidWebView.SslErrorData createSslErrorData(SslError error) {
-      final SslCertificate certificate = error.getCertificate();
-      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
-      String notValidNotAfterIso8601Date = sdf.format(certificate.getValidNotAfterDate());
-      String notValidNotBeforeIso8601Date = sdf.format(certificate.getValidNotBeforeDate());
-
-      GeneratedAndroidWebView.SslCertificateData.Builder sslCertificateData =
-              new GeneratedAndroidWebView.SslCertificateData.Builder()
-                      .setIssuedBy(certificate.getIssuedBy().toString())
-                      .setIssuedTo(certificate.getIssuedTo().toString())
-                      .setValidNotAfterIso8601Date(notValidNotAfterIso8601Date)
-                      .setValidNotBeforeIso8601Date(notValidNotBeforeIso8601Date);
-
-      if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-          X509Certificate x509Certificate = error.getCertificate().getX509Certificate();
-          if (x509Certificate != null) {
-              try {
-                  byte[] encoded = x509Certificate.getEncoded();
-                  sslCertificateData.setX509CertificateDer(encoded);
-              } catch (CertificateEncodingException e) {
-                  //Do nothing
-              }
-          }
+    final SslCertificate certificate = error.getCertificate();
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
+    String notValidNotAfterIso8601Date = sdf.format(certificate.getValidNotAfterDate());
+    String notValidNotBeforeIso8601Date = sdf.format(certificate.getValidNotBeforeDate());
+
+    GeneratedAndroidWebView.SslCertificateData.Builder sslCertificateData =
+        new GeneratedAndroidWebView.SslCertificateData.Builder()
+            .setIssuedBy(certificate.getIssuedBy().toString())
+            .setIssuedTo(certificate.getIssuedTo().toString())
+            .setValidNotAfterIso8601Date(notValidNotAfterIso8601Date)
+            .setValidNotBeforeIso8601Date(notValidNotBeforeIso8601Date);
+
+    if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      X509Certificate x509Certificate = error.getCertificate().getX509Certificate();
+      if (x509Certificate != null) {
+        try {
+          byte[] encoded = x509Certificate.getEncoded();
+          sslCertificateData.setX509CertificateDer(encoded);
+        } catch (CertificateEncodingException e) {
+          //Do nothing
+        }
       }
+    }
 
     GeneratedAndroidWebView.SslErrorData.Builder sslErrorData =
-            new GeneratedAndroidWebView.SslErrorData.Builder()
-                    .setErrorTypeData(toSslErrorTypeData(error.getPrimaryError()))
-                    .setCertificateData(sslCertificateData.build())
-                    .setUrl(error.getUrl());
+        new GeneratedAndroidWebView.SslErrorData.Builder()
+            .setErrorTypeData(toSslErrorTypeData(error.getPrimaryError()))
+            .setCertificateData(sslCertificateData.build())
+            .setUrl(error.getUrl());
 
     return sslErrorData.build();
   }
 
- static GeneratedAndroidWebView.SslErrorTypeData toSslErrorTypeData(int error) {
+  static GeneratedAndroidWebView.SslErrorTypeData toSslErrorTypeData(int error) {
     switch (error) {
-        case SslError.SSL_DATE_INVALID:
-            return GeneratedAndroidWebView.SslErrorTypeData.DATE_INVALID;
-        case SslError.SSL_EXPIRED:
-            return GeneratedAndroidWebView.SslErrorTypeData.EXPIRED;
-        case SslError.SSL_IDMISMATCH:
-            return GeneratedAndroidWebView.SslErrorTypeData.ID_MISMATCH;
-        case SslError.SSL_NOTYETVALID:
-            return GeneratedAndroidWebView.SslErrorTypeData.NOT_YET_VALID;
-        case SslError.SSL_UNTRUSTED:
-            return GeneratedAndroidWebView.SslErrorTypeData.UNTRUSTED;
-        default:
-            return GeneratedAndroidWebView.SslErrorTypeData.INVALID;
+      case SslError.SSL_DATE_INVALID:
+        return GeneratedAndroidWebView.SslErrorTypeData.DATE_INVALID;
+      case SslError.SSL_EXPIRED:
+        return GeneratedAndroidWebView.SslErrorTypeData.EXPIRED;
+      case SslError.SSL_IDMISMATCH:
+        return GeneratedAndroidWebView.SslErrorTypeData.ID_MISMATCH;
+      case SslError.SSL_NOTYETVALID:
+        return GeneratedAndroidWebView.SslErrorTypeData.NOT_YET_VALID;
+      case SslError.SSL_UNTRUSTED:
+        return GeneratedAndroidWebView.SslErrorTypeData.UNTRUSTED;
+      default:
+        return GeneratedAndroidWebView.SslErrorTypeData.INVALID;
     }
   }
 
@@ -337,13 +336,13 @@ public void onReceivedHttpAuthRequest(
 
   /** Passes arguments from {@link WebViewClient#onReceivedSslError} to Dart. */
   public void onReceivedSslError(
-          @NonNull WebViewClient webViewClient,
-          @NonNull WebView webview,
-          @NonNull SslErrorHandler sslErrorHandler,
-          @NonNull SslError error,
-          @NonNull Reply<Void> callback) {
+      @NonNull WebViewClient webViewClient,
+      @NonNull WebView webview,
+      @NonNull SslErrorHandler sslErrorHandler,
+      @NonNull SslError error,
+      @NonNull Reply<Void> callback) {
     new SslErrorHandlerFlutterApiImpl(binaryMessenger, instanceManager)
-            .create(sslErrorHandler, reply -> {});
+        .create(sslErrorHandler, reply -> {});
 
     onReceivedSslError(
         Objects.requireNonNull(instanceManager.getIdentifierForStrongReference(webViewClient)),
@@ -352,6 +351,7 @@ public void onReceivedSslError(
         createSslErrorData(error),
         callback);
   }
+
   private long getIdentifierForClient(WebViewClient webViewClient) {
     final Long identifier = instanceManager.getIdentifierForStrongReference(webViewClient);
     if (identifier == null) {

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewClientHostApiImpl.java

@@ -119,9 +119,7 @@ public void onReceivedHttpAuthRequest(
 
     @Override
     public void onReceivedSslError(
-        @NonNull WebView view,
-        @NonNull SslErrorHandler handler,
-        @NonNull SslError error) {
+        @NonNull WebView view, @NonNull SslErrorHandler handler, @NonNull SslError error) {
       flutterApi.onReceivedSslError(this, view, handler, error, reply -> {});
     }
 
@@ -231,7 +229,6 @@ public void onReceivedSslError(@NonNull WebView view, SslErrorHandler handler, S
       flutterApi.onReceivedSslError(this, view, handler, error, reply -> {});
     }
 
-
     @Override
     public void onUnhandledKeyEvent(@NonNull WebView view, @NonNull KeyEvent event) {
       // Deliberately empty. Occasionally the webview will mark events as having failed to be

packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java

@@ -119,7 +119,7 @@ private void setUp(
     HttpAuthHandlerHostApi.setup(
         binaryMessenger, new HttpAuthHandlerHostApiImpl(binaryMessenger, instanceManager));
     SslErrorHandlerHostApi.setup(
-            binaryMessenger, new SslErrorHandlerHostApiImpl(binaryMessenger, instanceManager));
+        binaryMessenger, new SslErrorHandlerHostApiImpl(binaryMessenger, instanceManager));
   }
 
   @Override

packages/webview_flutter/webview_flutter_android/lib/src/android_webview.dart

@@ -1715,4 +1715,3 @@ class SslErrorHandler extends JavaObject {
     return api.proceedFromInstance(this);
   }
 }
-

packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation.dart

@@ -510,7 +510,9 @@ class NSUrlProtectionSpace extends NSObject {
       port: port,
       realm: realm,
       sslErrorType: sslErrorType,
-      x509CertificateDer: x509CertificateDer == null ? null : Uint8List.fromList(x509CertificateDer!.toList()),
+      x509CertificateDer: x509CertificateDer == null
+          ? null
+          : Uint8List.fromList(x509CertificateDer!.toList()),
     );
   }
 }