diff --git a/android/dist/googlesignin.jar b/android/dist/googlesignin.jar deleted file mode 100644 index baddd7f..0000000 Binary files a/android/dist/googlesignin.jar and /dev/null differ diff --git a/android/dist/ti.googlesignin-android-1.0.6.zip b/android/dist/ti.googlesignin-android-1.0.6.zip deleted file mode 100644 index ebbe15a..0000000 Binary files a/android/dist/ti.googlesignin-android-1.0.6.zip and /dev/null differ diff --git a/android/dist/ti.googlesignin-android-1.0.7.zip b/android/dist/ti.googlesignin-android-1.0.7.zip deleted file mode 100644 index 8566317..0000000 Binary files a/android/dist/ti.googlesignin-android-1.0.7.zip and /dev/null differ diff --git a/android/dist/ti.googlesignin-android-1.0.8.zip b/android/dist/ti.googlesignin-android-1.0.8.zip deleted file mode 100644 index ac387e1..0000000 Binary files a/android/dist/ti.googlesignin-android-1.0.8.zip and /dev/null differ diff --git a/android/dist/ti.googlesignin-android-1.0.9.zip b/android/dist/ti.googlesignin-android-1.0.9.zip deleted file mode 100644 index 4ea441b..0000000 Binary files a/android/dist/ti.googlesignin-android-1.0.9.zip and /dev/null differ diff --git a/android/dist/ti.googlesignin-android-1.1.0.zip b/android/dist/ti.googlesignin-android-1.1.0.zip deleted file mode 100644 index 7687e8c..0000000 Binary files a/android/dist/ti.googlesignin-android-1.1.0.zip and /dev/null differ diff --git a/android/dist/ti.googlesignin-android-1.1.1.zip b/android/dist/ti.googlesignin-android-1.1.1.zip deleted file mode 100644 index b01eb85..0000000 Binary files a/android/dist/ti.googlesignin-android-1.1.1.zip and /dev/null differ diff --git a/android/dist/ti.googlesignin-android-1.1.2.zip b/android/dist/ti.googlesignin-android-1.1.2.zip deleted file mode 100644 index f149bfb..0000000 Binary files a/android/dist/ti.googlesignin-android-1.1.2.zip and /dev/null differ diff --git a/android/libs/armeabi-v7a/libti.googlesignin.so b/android/libs/armeabi-v7a/libti.googlesignin.so deleted file mode 100644 index fafa2c2..0000000 Binary files a/android/libs/armeabi-v7a/libti.googlesignin.so and /dev/null differ diff --git a/android/libs/x86/libti.googlesignin.so b/android/libs/x86/libti.googlesignin.so deleted file mode 100644 index 1ef81f2..0000000 Binary files a/android/libs/x86/libti.googlesignin.so and /dev/null differ diff --git a/android/manifest b/android/manifest index bf11dbb..38ac2cd 100644 --- a/android/manifest +++ b/android/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 1.1.2 +version: 1.1.3 apiversion: 3 architectures: armeabi-v7a x86 description: googlesignin diff --git a/android/src/ti/googlesignin/GooglesigninModule.java b/android/src/ti/googlesignin/GooglesigninModule.java index d6c3df9..1535728 100755 --- a/android/src/ti/googlesignin/GooglesigninModule.java +++ b/android/src/ti/googlesignin/GooglesigninModule.java @@ -118,6 +118,7 @@ protected synchronized void initialize(KrollDict opts) { .addApi(Auth.GOOGLE_SIGN_IN_API, gso) .addConnectionCallbacks(this) .addOnConnectionFailedListener(this).build(); + googleApiClient.connect(); Log.d(LCAT, "googleApiClient built, finished initialized"); } @@ -148,28 +149,33 @@ public void run() { @Kroll.method protected synchronized void signOut() { - if (googleApiClient == null) - return; - Auth.GoogleSignInApi.signOut(googleApiClient).setResultCallback( - new ResultCallback() { - @Override - public void onResult(Status status) { - Log.d(LCAT, "oResult SignOut"); - KrollDict kd = new KrollDict(); - kd.put("status", status.getStatusMessage()); - - if (hasListeners("onsignout")) { - Log.e(LCAT, - "The 'onsignout' event is deprecated, use 'disconnect' instead."); - fireEvent("onsignout", kd); - } + if (googleApiClient != null) { + if(googleApiClient.isConnected()){ + Auth.GoogleSignInApi.signOut(googleApiClient).setResultCallback( + new ResultCallback() { + @Override + public void onResult(Status status) { + Log.d(LCAT, "oResult SignOut"); + KrollDict kd = new KrollDict(); + kd.put("status", status.getStatusMessage()); - if (hasListeners("disconnect")) { - fireEvent("disconnect", kd); - } - } - }); + if (hasListeners("onsignout")) { + Log.e(LCAT, + "The 'onsignout' event is deprecated, use 'disconnect' instead."); + fireEvent("onsignout", kd); + } + if (hasListeners("disconnect")) { + fireEvent("disconnect", kd); + } + } + }); + }else{ + Log.d(LCAT, "googleApiClient not connected yet"); + } + }else{ + Log.d(LCAT, "googleApiClient doesnt exist"); + } } private final class SignInResultHandler implements TiActivityResultHandler { diff --git a/android/timodule.xml b/android/timodule.xml index f2d3c2d..f79c7fc 100644 --- a/android/timodule.xml +++ b/android/timodule.xml @@ -9,9 +9,7 @@ - +