#45 login and trySilendLogin now return userdata on Android

EddyVerbruggen · Apr 16, 2015 · 506f376 · 506f376
1 parent 769dd15
commit 506f376
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="nl.x-services.plugins.googleplus"
-        version="1.1.0">
+        version="1.1.1">
 
   <name>Google+</name>
 

diff --git a/src/android/GooglePlus.java b/src/android/GooglePlus.java
@@ -65,11 +65,11 @@ public boolean execute(String action, CordovaArgs args, CallbackContext callback
 
     } else if (ACTION_LOGIN.equals(action)) {
       this.trySilentLogin = false;
-      mGoogleApiClient.connect();
+      mGoogleApiClient.reconnect();
 
     } else if (ACTION_TRY_SILENT_LOGIN.equals(action)) {
       this.trySilentLogin = true;
-      mGoogleApiClient.connect();
+      mGoogleApiClient.reconnect();
 
     } else if (ACTION_LOGOUT.equals(action)) {
       try {
@@ -124,8 +124,8 @@ private void resolveToken(final String email, final JSONObject result) {
 
     cordova.getThreadPool().execute(new Runnable() {
       public void run() {
-        String scope = null;
-        String token = null;
+        String scope;
+        String token;
 
         try {
           if (GooglePlus.this.webKey != null){