Partial revert of "upgraded usage of BinaryMessenger (flutter#4451)" (f…

…lutter#4453) This reverts commit 9d63517. The work to accomodate the breaking change is no longer necessary.
amantoux · Dec 11, 2021 · dd651a5 · dd651a5
1 parent 444188d
commit dd651a5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 158 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -197,10 +197,6 @@ task:
         - export CIRRUS_CHANGE_MESSAGE=""
         - export CIRRUS_COMMIT_MESSAGE=""
         - ./script/tool_runner.sh lint-android # must come after build-examples
-      stable_channel_conditional_script:
-        - if [[ "$CHANNEL" == "stable" ]]; then
-        -   dart ./ci/stable_conditional.dart
-        - fi
       native_unit_test_script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.

diff --git a/ci/stable_conditional.dart b/ci/stable_conditional.dart
diff --git a/...ent/android/src/test/java/io/flutter/plugins/androidintent/MethodCallHandlerImplTest.java b/...ent/android/src/test/java/io/flutter/plugins/androidintent/MethodCallHandlerImplTest.java
@@ -55,11 +55,7 @@ public void startListening_registersChannel() {
     methodCallHandler.startListening(messenger);
 
     verify(messenger, times(1))
-        // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    //     .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
   }
 
   @Test
@@ -71,15 +67,9 @@ public void startListening_unregistersExistingChannel() {
     methodCallHandler.startListening(secondMessenger);
 
     // Unregisters the first and then registers the second.
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-    verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
+    verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
     verify(secondMessenger, times(1))
-        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
-    // verify(secondMessenger, times(1))
-    //     .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
   }
 
   @Test
@@ -89,11 +79,7 @@ public void stopListening_unregistersExistingChannel() {
 
     methodCallHandler.stopListening();
 
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-    verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+    verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
   }
 
   @Test
@@ -102,11 +88,7 @@ public void stopListening_doesNothingWhenUnset() {
 
     methodCallHandler.stopListening();
 
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-    verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null, null);
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+    verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
   }
 
   @Test

diff --git a/...ages/camera/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java b/...ages/camera/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java
@@ -12,7 +12,6 @@
 
 import android.os.Handler;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
@@ -32,15 +31,6 @@ public class DartMessengerTest {
   private static class FakeBinaryMessenger implements BinaryMessenger {
     private final List<ByteBuffer> sentMessages = new ArrayList<>();
 
-    // TODO(aaclarke): Remove when https://github.com/flutter/engine/pull/29147 is on stable.
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-    @Override
-    public BinaryMessenger.TaskQueue makeBackgroundTaskQueue() {
-      return null;
-    }
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
-
     @Override
     public void send(@NonNull String channel, ByteBuffer message) {
       sentMessages.add(message);
@@ -51,17 +41,8 @@ public void send(@NonNull String channel, ByteBuffer message, BinaryReply callba
       send(channel, message);
     }
 
-    // TODO(aaclarke): Remove when https://github.com/flutter/engine/pull/29147 is on stable.
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
     @Override
-    public void setMessageHandler(
-        @NonNull String channel,
-        BinaryMessageHandler handler,
-        @Nullable BinaryMessenger.TaskQueue taskQueue) {}
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // @Override
-    // public void setMessageHandler(@NonNull String channel, BinaryMessageHandler handler) {}
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+    public void setMessageHandler(@NonNull String channel, BinaryMessageHandler handler) {}
 
     List<ByteBuffer> getMessages() {
       return new ArrayList<>(sentMessages);

diff --git a/...quick_actions/android/src/test/java/io/flutter/plugins/quickactions/QuickActionsTest.java b/...quick_actions/android/src/test/java/io/flutter/plugins/quickactions/QuickActionsTest.java
@@ -33,15 +33,6 @@ public class QuickActionsTest {
   private static class TestBinaryMessenger implements BinaryMessenger {
     public MethodCall lastMethodCall;
 
-    // TODO(aaclarke): Remove when https://github.com/flutter/engine/pull/29147 is on stable.
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-    @Override
-    public BinaryMessenger.TaskQueue makeBackgroundTaskQueue() {
-      return null;
-    }
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
-
     @Override
     public void send(@NonNull String channel, @Nullable ByteBuffer message) {
       send(channel, message, null);
@@ -58,21 +49,10 @@ public void send(
       }
     }
 
-    // TODO(aaclarke): Remove when https://github.com/flutter/engine/pull/29147 is on stable.
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
     @Override
-    public void setMessageHandler(
-        @NonNull String channel,
-        @Nullable BinaryMessageHandler handler,
-        @Nullable BinaryMessenger.TaskQueue taskQueue) {
+    public void setMessageHandler(@NonNull String channel, @Nullable BinaryMessageHandler handler) {
       // Do nothing.
     }
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // @Override
-    // public void setMessageHandler(
-    //    @NonNull String channel,
-    //    @Nullable BinaryMessageHandler handler) {}
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
   }
 
   static final int SUPPORTED_BUILD = 25;

diff --git a/...ncher/android/src/test/java/io/flutter/plugins/urllauncher/MethodCallHandlerImplTest.java b/...ncher/android/src/test/java/io/flutter/plugins/urllauncher/MethodCallHandlerImplTest.java
@@ -44,11 +44,7 @@ public void startListening_registersChannel() {
     methodCallHandler.startListening(messenger);
 
     verify(messenger, times(1))
-        // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    //     .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
   }
 
   @Test
@@ -60,15 +56,9 @@ public void startListening_unregistersExistingChannel() {
     methodCallHandler.startListening(secondMessenger);
 
     // Unregisters the first and then registers the second.
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-    verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
+    verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
     verify(secondMessenger, times(1))
-        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
-    // verify(secondMessenger, times(1))
-    //     .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
   }
 
   @Test
@@ -78,11 +68,7 @@ public void stopListening_unregistersExistingChannel() {
 
     methodCallHandler.stopListening();
 
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-    verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+    verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
   }
 
   @Test
@@ -91,11 +77,7 @@ public void stopListening_doesNothingWhenUnset() {
 
     methodCallHandler.stopListening();
 
-    // FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
-    verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null, null);
-    // FLUTTER_STABLE_CONDITIONAL_ELSE
-    // verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
-    // FLUTTER_STABLE_CONDITIONAL_ENDIF
+    verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
   }
 
   @Test