formatting

Author: LongCatIsLooong

shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java

@@ -293,14 +293,14 @@ public interface TextInputMethodHandler {
     void requestAutofill();
 
     /**
-     * Requests that the {@link AutofillManager} cancel or commit the current
-     * autofill context, depending on the value of {@code shouldSave}.
+     * Requests that the {@link AutofillManager} cancel or commit the current autofill context.
      *
-     * The method calls {@link android.view.autofill.AutofillManager#commit()} when {@code shouldSave}
-     * is true, and calls {@link android.view.autofill.AutofillManager#cancel()} otherwise.
+     * <p>The method calls {@link android.view.autofill.AutofillManager#commit()} when {@code
+     * shouldSave} is true, and calls {@link android.view.autofill.AutofillManager#cancel()}
+     * otherwise.
      *
-     * @param shouldSave whether the active autofill service should save the
-     *                   current user input for future use.
+     * @param shouldSave whether the active autofill service should save the current user input for
+     *     future use.
      */
     void finishAutofillContext(boolean shouldSave);
 

shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java

@@ -84,8 +84,9 @@ public void requestAutofill() {
 
           @Override
           public void finishAutofillContext(boolean shouldSave) {
-            if (afm == null)
+            if (afm == null) {
               return;
+            }
             if (shouldSave) {
               afm.commit();
             } else {

shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java

@@ -35,7 +35,6 @@
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.JSONMethodCodec;
 import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.platform.PlatformViewsController;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -71,9 +70,11 @@ private void verifyMethodCall(ByteBuffer buffer, String methodName, String[] exp
     }
   }
 
-  private static void sendToBinaryMessageHandler(BinaryMessenger.BinaryMessageHandler binaryMessageHandler, String method, Object args) {
+  private static void sendToBinaryMessageHandler(
+      BinaryMessenger.BinaryMessageHandler binaryMessageHandler, String method, Object args) {
     MethodCall methodCall = new MethodCall(method, args);
-    ByteBuffer encodedMethodCall = JSONMethodCodec.INSTANCE.encodeMethodCall(methodCall).position(0);
+    ByteBuffer encodedMethodCall =
+        JSONMethodCodec.INSTANCE.encodeMethodCall(methodCall).position(0);
     binaryMessageHandler.onMessage(encodedMethodCall, mock(BinaryMessenger.BinaryReply.class));
   }
 
@@ -539,20 +540,21 @@ public void autofill_onProvideVirtualViewStructure_single() {
   }
 
   @Test
-  public void respondsToInputChannelMessages () {
-    ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor = ArgumentCaptor.forClass(BinaryMessenger.BinaryMessageHandler.class);
+  public void respondsToInputChannelMessages() {
+    ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor =
+        ArgumentCaptor.forClass(BinaryMessenger.BinaryMessageHandler.class);
     DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
-    TextInputChannel.TextInputMethodHandler mockHandler = mock(TextInputChannel.TextInputMethodHandler.class);
+    TextInputChannel.TextInputMethodHandler mockHandler =
+        mock(TextInputChannel.TextInputMethodHandler.class);
     TextInputChannel textInputChannel = new TextInputChannel(mockBinaryMessenger);
 
     textInputChannel.setTextInputMethodHandler(mockHandler);
 
     verify(mockBinaryMessenger, times(1))
-            .setMessageHandler(
-                    any(String.class),
-                    binaryMessageHandlerCaptor.capture());
+        .setMessageHandler(any(String.class), binaryMessageHandlerCaptor.capture());
 
-    BinaryMessenger.BinaryMessageHandler binaryMessageHandler = binaryMessageHandlerCaptor.getValue();
+    BinaryMessenger.BinaryMessageHandler binaryMessageHandler =
+        binaryMessageHandlerCaptor.getValue();
 
     sendToBinaryMessageHandler(binaryMessageHandler, "TextInput.requestAutofill", null);
     verify(mockHandler, times(1)).requestAutofill();

shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm

@@ -220,8 +220,18 @@ static UITextContentType ToUITextContentType(NSArray<NSString*>* hints) {
   return [dictionary[@"obscureText"] boolValue] ? @"password" : nil;
 }
 
-// We refer to password/username autofill, one-time-code autofill,
-// and predictive text for contact information etc. as autofill.
+// There're 2 types of autofills on native iOS:
+// - Regular autofill, includes contact information autofill and
+//   one-time-code autofill, takes place in the form of predictive
+//   text in the quick type bar. This type of autofill does not save
+//   user input.
+// - Password autofill, includes automatic strong password and regular
+//   password autofill. The former happens automatically when a
+//   "new password" field is detected, and only that password field
+//   will be filled. The latter appears in the quick type bar when
+//   an eligible input field becomes the first responder, and may
+//   fill both the username and the password fields. iOS will attempt
+//   to save user input for both kinds of password fields.
 typedef NS_ENUM(NSInteger, FlutterAutofillType) {
   FlutterAutofillTypeNone,
   FlutterAutofillTypeRegular,
@@ -238,7 +248,7 @@ static FlutterAutofillType autofillTypeOf(NSDictionary* configuration) {
     // for multiple input fields when there's a password input field among them.
     // When the configuration contains more than 1 field, we consider this
     // autofill group password related.
-    if (isSecureTextEntry || (fields && [fields count] > 1))
+    if (isSecureTextEntry || (fields && fields.count > 1))
       return FlutterAutofillTypePassword;
 
     if (uniqueIdFromDictionary(configuration) == nil) {
@@ -324,9 +334,9 @@ - (BOOL)isEqualTo:(FlutterTextRange*)other {
 // selectors it can't respond to to a shared UITextField instance.
 //
 // Relevant API docs claim that password autofill supports any custom view
-// that adopts the UITextInput protocol, auto strong password seems to
-// currently only support UITextFields and saving username/password
-// for autofill only supports UITextFields and UITextViews, as of iOS 13.5.
+// that adopts the UITextInput protocol, automatic strong password seems to
+// currently only support UITextFields, and password saving only supports
+// UITextFields and UITextViews, as of iOS 13.5.
 @interface FlutterSecureTextInputView : FlutterTextInputView
 @property(class, nonatomic, assign, readonly) UITextField* textField;
 @end
@@ -435,11 +445,13 @@ - (void)configureWithDictionary:(NSDictionary*)configuration {
                                 ? UITextAutocorrectionTypeNo
                                 : UITextAutocorrectionTypeDefault;
   if (@available(iOS 10.0, *)) {
+    _autofillId = uniqueIdFromDictionary(configuration);
     if (autofill == nil) {
       self.textContentType = @"";
     } else {
       self.textContentType = ToUITextContentType(autofill[@"hints"]);
       [self setTextInputState:autofill[@"editingValue"]];
+      NSAssert(_autofillId, @"The autofill configuration must contain an autofill id");
       // The input field needs to be visible for the system autofill
       // to find it.
       self.frame = CGRectMake(0, 0, 1, 1);
@@ -524,7 +536,8 @@ - (NSRange)clampSelection:(NSRange)range forText:(NSString*)text {
 - (BOOL)canBecomeFirstResponder {
   // Only the currently focused input field can
   // become the first responder. This prevents iOS
-  // from changing focus by itself.
+  // from changing focus by itself (the framework
+  // focus will be out of sync if that happens).
   return _textInputClient != 0;
 }
 
@@ -1132,11 +1145,12 @@ - (FlutterTextInputView*)getOrCreateAutofillableView:(NSDictionary*)field
   }
 
   inputView.textInputDelegate = _textInputDelegate;
-  inputView.autofillId = autofillId;
   [inputView configureWithDictionary:field];
   return inputView;
 }
 
+// Remove every installed input field, unless it's in the current autofill
+// context.
 - (void)removeNonPasswordAutofillFields:(BOOL)removeNonAutofillField {
   UIWindow* keyWindow = [UIApplication sharedApplication].keyWindow;
 

shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m

@@ -258,6 +258,7 @@ - (void)testAutofillContext {
   oldContext = textInputPlugin.autofillContext;
   [self setClientId:200 configuration:config];
 
+  // Reuse the input view instance from the last time.
   XCTAssertEqual(textInputPlugin.autofillContext.count, 4);
   XCTAssertEqual(self.installedInputViews.count, 4);
 
@@ -348,16 +349,16 @@ - (void)testAutofillInputViews {
   OCMVerify([engine updateEditingClient:0 withState:[OCMArg isNotNil] withTag:@"field2"]);
 }
 
--(void)testPasswordAutofillHack {
+- (void)testPasswordAutofillHack {
   NSDictionary* config = self.mutableTemplateCopy;
   [config setValue:@"YES" forKey:@"obscureText"];
   [self setClientId:123 configuration:config];
-  
+
   // Find all the FlutterTextInputViews we created.
   NSArray<FlutterTextInputView*>* inputFields = self.installedInputViews;
-  
+
   FlutterTextInputView* inputView = inputFields[0];
-  
+
   XCTAssert([inputView isKindOfClass:[UITextField class]]);
   // FlutterSecureTextInputView does not respond to font,
   // but it should return the default UITextField.font.