From 2c6ff1884f6a034020066dd6f81bbfcc321fbde6 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Sat, 25 May 2019 15:21:12 -0700 Subject: [PATCH] Apply minor cleanups to Android embedding Eliminate an unused import, add missing @Override annotations, and eliminate an unused logger. --- .../engine/FlutterEnginePluginRegistry.java | 16 ++++++++++++++++ .../plugin/editing/InputConnectionAdaptor.java | 3 --- .../android/io/flutter/view/FlutterMain.java | 1 - 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java b/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java index 3d99e397bb70d..f1c449a899789 100644 --- a/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java +++ b/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java @@ -97,6 +97,7 @@ public void destroy() { removeAll(); } + @Override public void add(@NonNull FlutterPlugin plugin) { // Add the plugin to our generic set of plugins and notify the plugin // that is has been attached to an engine. @@ -152,20 +153,24 @@ public void add(@NonNull FlutterPlugin plugin) { } } + @Override public void add(@NonNull Set plugins) { for (FlutterPlugin plugin : plugins) { add(plugin); } } + @Override public boolean has(@NonNull Class pluginClass) { return plugins.containsKey(pluginClass); } + @Override public FlutterPlugin get(@NonNull Class pluginClass) { return plugins.get(pluginClass); } + @Override public void remove(@NonNull Class pluginClass) { FlutterPlugin plugin = plugins.get(pluginClass); if (plugin != null) { @@ -220,12 +225,14 @@ public void remove(@NonNull Class pluginClass) { } } + @Override public void remove(@NonNull Set> pluginClasses) { for (Class pluginClass : pluginClasses) { remove(pluginClass); } } + @Override public void removeAll() { // We copy the keys to a new set so that we can mutate the set while using // the keys. @@ -489,6 +496,7 @@ public FlutterEngineActivityPluginBinding(@NonNull Activity activity) { * Returns the {@link Activity} that is currently attached to the {@link FlutterEngine} that * owns this {@code ActivityPluginBinding}. */ + @Override @NonNull public Activity getActivity() { return activity; @@ -498,6 +506,7 @@ public Activity getActivity() { * Adds a listener that is invoked whenever the associated {@link Activity}'s * {@code onRequestPermissionsResult(...)} method is invoked. */ + @Override public void addRequestPermissionsResultListener(@NonNull io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener listener) { onRequestPermissionsResultListeners.add(listener); } @@ -505,6 +514,7 @@ public void addRequestPermissionsResultListener(@NonNull io.flutter.plugin.commo /** * Removes a listener that was added in {@link #addRequestPermissionsResultListener(io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener)}. */ + @Override public void removeRequestPermissionsResultListener(@NonNull io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener listener) { onRequestPermissionsResultListeners.remove(listener); } @@ -525,6 +535,7 @@ boolean onRequestPermissionsResult(int requestCode, @NonNull String[] permission * Adds a listener that is invoked whenever the associated {@link Activity}'s * {@code onActivityResult(...)} method is invoked. */ + @Override public void addActivityResultListener(@NonNull io.flutter.plugin.common.PluginRegistry.ActivityResultListener listener) { onActivityResultListeners.add(listener); } @@ -532,6 +543,7 @@ public void addActivityResultListener(@NonNull io.flutter.plugin.common.PluginRe /** * Removes a listener that was added in {@link #addActivityResultListener(io.flutter.plugin.common.PluginRegistry.ActivityResultListener)}. */ + @Override public void removeActivityResultListener(@NonNull io.flutter.plugin.common.PluginRegistry.ActivityResultListener listener) { onActivityResultListeners.remove(listener); } @@ -552,6 +564,7 @@ boolean onActivityResult(int requestCode, int resultCode, @NonNull Intent data) * Adds a listener that is invoked whenever the associated {@link Activity}'s * {@code onNewIntent(...)} method is invoked. */ + @Override public void addOnNewIntentListener(@NonNull io.flutter.plugin.common.PluginRegistry.NewIntentListener listener) { onNewIntentListeners.add(listener); } @@ -559,6 +572,7 @@ public void addOnNewIntentListener(@NonNull io.flutter.plugin.common.PluginRegis /** * Removes a listener that was added in {@link #addOnNewIntentListener(io.flutter.plugin.common.PluginRegistry.NewIntentListener)}. */ + @Override public void removeOnNewIntentListener(@NonNull io.flutter.plugin.common.PluginRegistry.NewIntentListener listener) { onNewIntentListeners.remove(listener); } @@ -577,6 +591,7 @@ void onNewIntent(@Nullable Intent intent) { * Adds a listener that is invoked whenever the associated {@link Activity}'s * {@code onUserLeaveHint()} method is invoked. */ + @Override public void addOnUserLeaveHintListener(@NonNull io.flutter.plugin.common.PluginRegistry.UserLeaveHintListener listener) { onUserLeaveHintListeners.add(listener); } @@ -584,6 +599,7 @@ public void addOnUserLeaveHintListener(@NonNull io.flutter.plugin.common.PluginR /** * Removes a listener that was added in {@link #addOnUserLeaveHintListener(io.flutter.plugin.common.PluginRegistry.UserLeaveHintListener)}. */ + @Override public void removeOnUserLeaveHintListener(@NonNull io.flutter.plugin.common.PluginRegistry.UserLeaveHintListener listener) { onUserLeaveHintListeners.remove(listener); } diff --git a/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java b/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java index 02010b13c467b..5527a8aaba542 100644 --- a/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java +++ b/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java @@ -29,9 +29,6 @@ class InputConnectionAdaptor extends BaseInputConnection { private InputMethodManager mImm; private final Layout mLayout; - private static final MethodChannel.Result logger = - new ErrorLogResult("FlutterTextInput"); - @SuppressWarnings("deprecation") public InputConnectionAdaptor( View view, diff --git a/shell/platform/android/io/flutter/view/FlutterMain.java b/shell/platform/android/io/flutter/view/FlutterMain.java index 2108ae5f76f78..b1754cbef1e3a 100644 --- a/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/shell/platform/android/io/flutter/view/FlutterMain.java @@ -4,7 +4,6 @@ package io.flutter.view; -import android.app.AlarmManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent;