[google_sign_in] Android: Move GoogleSignInWrapper to a separate file. (#2636)
diff --git a/packages/google_sign_in/google_sign_in/CHANGELOG.md b/packages/google_sign_in/google_sign_in/CHANGELOG.md
index 1a3011f..9c031f9 100644
--- a/packages/google_sign_in/google_sign_in/CHANGELOG.md
+++ b/packages/google_sign_in/google_sign_in/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.4.1
+
+* Android: Move `GoogleSignInWrapper` to a separate class.
+
## 4.4.0
* Migrate to Android v2 embedder.
diff --git a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
index d3ea915..f398721 100755
--- a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
+++ b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java
@@ -659,28 +659,3 @@
}
}
}
-
-/**
- * A wrapper object that calls static method in GoogleSignIn.
- *
- * <p>Because GoogleSignIn uses static method mostly, which is hard for unit testing. We use this
- * wrapper class to use instance method which calls the corresponding GoogleSignIn static methods.
- *
- * <p>Warning! This class should stay true that each method calls a GoogleSignIn static method with
- * the same name and same parameters.
- */
-class GoogleSignInWrapper {
-
- GoogleSignInAccount getLastSignedInAccount(Context context) {
- return GoogleSignIn.getLastSignedInAccount(context);
- }
-
- boolean hasPermissions(GoogleSignInAccount account, Scope scope) {
- return GoogleSignIn.hasPermissions(account, scope);
- }
-
- void requestPermissions(
- Activity activity, int requestCode, GoogleSignInAccount account, Scope[] scopes) {
- GoogleSignIn.requestPermissions(activity, requestCode, account, scopes);
- }
-}
diff --git a/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInWrapper.java b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInWrapper.java
new file mode 100644
index 0000000..985903f
--- /dev/null
+++ b/packages/google_sign_in/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInWrapper.java
@@ -0,0 +1,36 @@
+// Copyright 2020, the Flutter project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package io.flutter.plugins.googlesignin;
+
+import android.app.Activity;
+import android.content.Context;
+import com.google.android.gms.auth.api.signin.GoogleSignIn;
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+import com.google.android.gms.common.api.Scope;
+
+/**
+ * A wrapper object that calls static method in GoogleSignIn.
+ *
+ * <p>Because GoogleSignIn uses static method mostly, which is hard for unit testing. We use this
+ * wrapper class to use instance method which calls the corresponding GoogleSignIn static methods.
+ *
+ * <p>Warning! This class should stay true that each method calls a GoogleSignIn static method with
+ * the same name and same parameters.
+ */
+public class GoogleSignInWrapper {
+
+ GoogleSignInAccount getLastSignedInAccount(Context context) {
+ return GoogleSignIn.getLastSignedInAccount(context);
+ }
+
+ boolean hasPermissions(GoogleSignInAccount account, Scope scope) {
+ return GoogleSignIn.hasPermissions(account, scope);
+ }
+
+ void requestPermissions(
+ Activity activity, int requestCode, GoogleSignInAccount account, Scope[] scopes) {
+ GoogleSignIn.requestPermissions(activity, requestCode, account, scopes);
+ }
+}
diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml
index 055b7c5..94b1e42 100644
--- a/packages/google_sign_in/google_sign_in/pubspec.yaml
+++ b/packages/google_sign_in/google_sign_in/pubspec.yaml
@@ -2,7 +2,7 @@
description: Flutter plugin for Google Sign-In, a secure authentication system
for signing in with a Google account on Android and iOS.
homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in
-version: 4.4.0
+version: 4.4.1
flutter:
plugin:
