From 2474cf79062a4dbe9cb120de9c3b3c16e9864b5e Mon Sep 17 00:00:00 2001 From: pr_Mais Date: Fri, 3 Dec 2021 01:19:48 +0300 Subject: [PATCH] chore: run format --- .../analysis_options.yaml | 4 - .../FirebaseInstallationsPlugin.java | 90 +++++++++---------- .../FlutterFirebaseAppRegistrar.java | 3 +- .../TokenChannelStreamHandler.java | 9 +- .../ios/Classes/FirebaseInstallationsPlugin.h | 2 +- .../ios/Classes/FirebaseInstallationsPlugin.m | 21 +++-- .../ios/Classes/FLTFirebaseMessagingPlugin.m | 2 +- 7 files changed, 56 insertions(+), 75 deletions(-) delete mode 100644 packages/firebase_installations/firebase_installations/analysis_options.yaml diff --git a/packages/firebase_installations/firebase_installations/analysis_options.yaml b/packages/firebase_installations/firebase_installations/analysis_options.yaml deleted file mode 100644 index a5744c1cfbe7..000000000000 --- a/packages/firebase_installations/firebase_installations/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: package:flutter_lints/flutter.yaml - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/FirebaseInstallationsPlugin.java b/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/FirebaseInstallationsPlugin.java index 9f8946367fc6..0b237acfae4b 100644 --- a/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/FirebaseInstallationsPlugin.java +++ b/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/FirebaseInstallationsPlugin.java @@ -1,19 +1,12 @@ package io.flutter.plugins.firebase.installations.firebase_installations; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.gms.tasks.Task; import com.google.android.gms.tasks.Tasks; import com.google.firebase.FirebaseApp; import com.google.firebase.installations.FirebaseInstallations; import com.google.firebase.installations.InstallationTokenResult; -import com.google.firebase.installations.internal.FidListener; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.EventChannel; @@ -23,27 +16,26 @@ import io.flutter.plugin.common.MethodChannel.Result; import io.flutter.plugins.firebase.core.FlutterFirebasePlugin; import io.flutter.plugins.firebase.core.FlutterFirebasePluginRegistry; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; -/** - * FirebaseInstallationsPlugin - */ -public class FirebaseInstallationsPlugin implements FlutterFirebasePlugin, FlutterPlugin, MethodCallHandler { +/** FirebaseInstallationsPlugin */ +public class FirebaseInstallationsPlugin + implements FlutterFirebasePlugin, FlutterPlugin, MethodCallHandler { private MethodChannel channel; private static final String METHOD_CHANNEL_NAME = "plugins.flutter.io/firebase_installations"; private final Map streamHandlers = new HashMap<>(); - @Nullable - private BinaryMessenger messenger; + @Nullable private BinaryMessenger messenger; private MethodChannel setup(BinaryMessenger binaryMessenger) { - final MethodChannel channel = - new MethodChannel(binaryMessenger, METHOD_CHANNEL_NAME); + final MethodChannel channel = new MethodChannel(binaryMessenger, METHOD_CHANNEL_NAME); channel.setMethodCallHandler(this); this.messenger = binaryMessenger; return channel; } - @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) { BinaryMessenger binaryMessenger = flutterPluginBinding.getBinaryMessenger(); @@ -59,7 +51,6 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { messenger = null; removeEventListeners(); - } private FirebaseInstallations getInstallations(Map arguments) { @@ -74,31 +65,32 @@ private Task getId(Map arguments) { private Task getToken(Map arguments) { return Tasks.call( - cachedThreadPool, - () -> { - FirebaseInstallations firebaseInstallations = getInstallations(arguments); - Boolean forceRefresh = (Boolean) Objects.requireNonNull(arguments.get("forceRefresh")); - InstallationTokenResult tokenResult = Tasks.await(firebaseInstallations.getToken(forceRefresh)); - return tokenResult.getToken(); - }); + cachedThreadPool, + () -> { + FirebaseInstallations firebaseInstallations = getInstallations(arguments); + Boolean forceRefresh = (Boolean) Objects.requireNonNull(arguments.get("forceRefresh")); + InstallationTokenResult tokenResult = + Tasks.await(firebaseInstallations.getToken(forceRefresh)); + return tokenResult.getToken(); + }); } private Task registerTokenListener(Map arguments) { return Tasks.call( - cachedThreadPool, - () -> { - String appName = (String) Objects.requireNonNull(arguments.get("appName")); - FirebaseInstallations firebaseInstallations = getInstallations(arguments); + cachedThreadPool, + () -> { + String appName = (String) Objects.requireNonNull(arguments.get("appName")); + FirebaseInstallations firebaseInstallations = getInstallations(arguments); - TokenChannelStreamHandler handler = new TokenChannelStreamHandler(firebaseInstallations); + TokenChannelStreamHandler handler = new TokenChannelStreamHandler(firebaseInstallations); - final String name = METHOD_CHANNEL_NAME + "/token/" + appName; - final EventChannel channel = new EventChannel(messenger, name); - channel.setStreamHandler(handler); - streamHandlers.put(channel, handler); + final String name = METHOD_CHANNEL_NAME + "/token/" + appName; + final EventChannel channel = new EventChannel(messenger, name); + channel.setStreamHandler(handler); + streamHandlers.put(channel, handler); - return name; - }); + return name; + }); } private Task deleteId(Map arguments) { @@ -126,21 +118,20 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) { default: result.notImplemented(); return; - } methodCallTask.addOnCompleteListener( - task -> { - if (task.isSuccessful()) { - result.success(task.getResult()); - } else { - Exception exception = task.getException(); - result.error( - "firebase_installations", - exception != null ? exception.getMessage() : null, - getExceptionDetails(exception)); - } - }); + task -> { + if (task.isSuccessful()) { + result.success(task.getResult()); + } else { + Exception exception = task.getException(); + result.error( + "firebase_installations", + exception != null ? exception.getMessage() : null, + getExceptionDetails(exception)); + } + }); } private Map getExceptionDetails(@Nullable Exception exception) { @@ -154,7 +145,6 @@ private Map getExceptionDetails(@Nullable Exception exception) { return details; } - @Override public Task> getPluginConstantsForFirebaseApp(FirebaseApp firebaseApp) { return Tasks.call(cachedThreadPool, () -> null); diff --git a/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/FlutterFirebaseAppRegistrar.java b/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/FlutterFirebaseAppRegistrar.java index 4eef816fabb2..ff8becf25d7b 100644 --- a/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/FlutterFirebaseAppRegistrar.java +++ b/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/FlutterFirebaseAppRegistrar.java @@ -3,6 +3,7 @@ // found in the LICENSE file. package io.flutter.plugins.firebase.installations.firebase_installations; + import androidx.annotation.Keep; import com.google.firebase.components.Component; import com.google.firebase.components.ComponentRegistrar; @@ -15,6 +16,6 @@ public class FlutterFirebaseAppRegistrar implements ComponentRegistrar { @Override public List> getComponents() { return Collections.>singletonList( - LibraryVersionComponent.create(BuildConfig.LIBRARY_NAME, BuildConfig.LIBRARY_VERSION)); + LibraryVersionComponent.create(BuildConfig.LIBRARY_NAME, BuildConfig.LIBRARY_VERSION)); } } diff --git a/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/TokenChannelStreamHandler.java b/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/TokenChannelStreamHandler.java index 82025d105b3f..39a55dba7c84 100644 --- a/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/TokenChannelStreamHandler.java +++ b/packages/firebase_installations/firebase_installations/android/src/main/java/io/flutter/plugins/firebase/installations/firebase_installations/TokenChannelStreamHandler.java @@ -1,16 +1,12 @@ package io.flutter.plugins.firebase.installations.firebase_installations; -import androidx.annotation.NonNull; import com.google.firebase.installations.FirebaseInstallations; import com.google.firebase.installations.internal.FidListener; - +import io.flutter.plugin.common.EventChannel; import java.util.HashMap; import java.util.Map; -import io.flutter.Log; -import io.flutter.plugin.common.EventChannel; - public class TokenChannelStreamHandler implements EventChannel.StreamHandler { private final FirebaseInstallations firebaseInstallations; @@ -25,7 +21,6 @@ public void onListen(Object arguments, EventChannel.EventSink events) { listener = createTokenEventListener(events); - firebaseInstallations.registerFidListener(listener); } @@ -40,7 +35,7 @@ FidListener createTokenEventListener(final EventChannel.EventSink events) { return token -> { Map event = new HashMap<>(); - event.put("token" , token); + event.put("token", token); events.success(event); }; diff --git a/packages/firebase_installations/firebase_installations/ios/Classes/FirebaseInstallationsPlugin.h b/packages/firebase_installations/firebase_installations/ios/Classes/FirebaseInstallationsPlugin.h index 31d7414acd83..e1c9a70eddc6 100644 --- a/packages/firebase_installations/firebase_installations/ios/Classes/FirebaseInstallationsPlugin.h +++ b/packages/firebase_installations/firebase_installations/ios/Classes/FirebaseInstallationsPlugin.h @@ -1,5 +1,5 @@ #import #import -@interface FirebaseInstallationsPlugin : FLTFirebasePlugin +@interface FirebaseInstallationsPlugin : FLTFirebasePlugin @end diff --git a/packages/firebase_installations/firebase_installations/ios/Classes/FirebaseInstallationsPlugin.m b/packages/firebase_installations/firebase_installations/ios/Classes/FirebaseInstallationsPlugin.m index a3525542d0f7..2e10e8ea08ad 100644 --- a/packages/firebase_installations/firebase_installations/ios/Classes/FirebaseInstallationsPlugin.m +++ b/packages/firebase_installations/firebase_installations/ios/Classes/FirebaseInstallationsPlugin.m @@ -13,25 +13,24 @@ + (void)registerWithRegistrar:(NSObject*)registrar { [SwiftFirebaseInstallationsPlugin registerWithRegistrar:registrar]; } -- (void)didReinitializeFirebaseCore:(void (^ _Nonnull)(void))completion { - completion(); +- (void)didReinitializeFirebaseCore:(void (^_Nonnull)(void))completion { + completion(); } -- (NSString * _Nonnull)firebaseLibraryName { - return LIBRARY_NAME; +- (NSString* _Nonnull)firebaseLibraryName { + return LIBRARY_NAME; } -- (NSString * _Nonnull)firebaseLibraryVersion { - return LIBRARY_VERSION; +- (NSString* _Nonnull)firebaseLibraryVersion { + return LIBRARY_VERSION; } -- (NSString * _Nonnull)flutterChannelName { - return @"plugins.flutter.io/firebase_installations"; +- (NSString* _Nonnull)flutterChannelName { + return @"plugins.flutter.io/firebase_installations"; } -- (NSDictionary * _Nonnull)pluginConstantsForFIRApp:(FIRApp * _Nonnull)firebaseApp { - return @{}; +- (NSDictionary* _Nonnull)pluginConstantsForFIRApp:(FIRApp* _Nonnull)firebaseApp { + return @{}; } @end - diff --git a/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m b/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m index 8ee1dcb2089f..3523a83948ca 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m +++ b/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m @@ -180,7 +180,7 @@ - (void)messaging:(nonnull FIRMessaging *)messaging if ([[GULAppDelegateSwizzler sharedApplication].delegate respondsToSelector:messaging_didReceiveRegistrationTokenSelector]) { void (*usersDidReceiveRegistrationTokenIMP)(id, SEL, FIRMessaging *, NSString *) = - (typeof(usersDidReceiveRegistrationTokenIMP)) & objc_msgSend; + (typeof(usersDidReceiveRegistrationTokenIMP))&objc_msgSend; usersDidReceiveRegistrationTokenIMP([GULAppDelegateSwizzler sharedApplication].delegate, messaging_didReceiveRegistrationTokenSelector, messaging, fcmToken);