From 990d7cb034bfa814a87a8987bf469bc73837e4cd Mon Sep 17 00:00:00 2001 From: Maksim Date: Mon, 5 Jun 2017 12:53:20 +0200 Subject: [PATCH] Updates library versions, adds possibility to use custom gPlus button --- README.md | 5 --- build.gradle | 2 +- library/build.gradle | 14 +++---- .../easylogin/networks/GooglePlusNetwork.java | 5 +-- .../easylogin/networks/TwitterNetwork.java | 39 +++++-------------- sample/src/main/AndroidManifest.xml | 2 - .../easylogin/sample/MainActivity.java | 4 +- sample/src/main/res/values/strings.xml | 1 - 8 files changed, 22 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 5cd58ba..987615e 100644 --- a/README.md +++ b/README.md @@ -74,11 +74,6 @@ twitterButton = (TwitterLoginButton) findViewById(R.id.twitter_login_button); twitter.requestLogin(twitterButton, this); ``` -You also need to make sure to add the Fabric API Key your manifest: -``` - -``` - Google Plus Connection -------- diff --git a/build.gradle b/build.gradle index c3ec809..f108d9b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.google.gms:google-services:3.0.0' } } diff --git a/library/build.gradle b/library/build.gradle index 2c340cd..b31b507 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.android.library' ext { PUBLISH_GROUP_ID = 'com.maksim88' PUBLISH_ARTIFACT_ID = 'EasyLogin' - PUBLISH_VERSION = 'v0.4' + PUBLISH_VERSION = 'v0.5' } android { @@ -34,13 +34,13 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.2.0' + compile 'com.android.support:appcompat-v7:25.3.1' // dependency with older facebook tools - compile 'com.android.support:cardview-v7:25.2.0' - compile 'com.android.support:customtabs:25.2.0' - compile 'com.facebook.android:facebook-android-sdk:4.20.0' - compile 'com.google.android.gms:play-services-auth:10.2.0' - compile('com.twitter.sdk.android:twitter:2.3.2@aar') { + compile 'com.android.support:cardview-v7:25.3.1' + compile 'com.android.support:customtabs:25.3.1' + compile 'com.facebook.android:facebook-android-sdk:4.23.0' + compile 'com.google.android.gms:play-services-auth:10.2.6' + compile('com.twitter.sdk.android:twitter-core:3.0.0@aar') { transitive = true; } } diff --git a/library/src/main/java/com/maksim88/easylogin/networks/GooglePlusNetwork.java b/library/src/main/java/com/maksim88/easylogin/networks/GooglePlusNetwork.java index aef77bd..b7dbfe8 100644 --- a/library/src/main/java/com/maksim88/easylogin/networks/GooglePlusNetwork.java +++ b/library/src/main/java/com/maksim88/easylogin/networks/GooglePlusNetwork.java @@ -15,7 +15,6 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions; import com.google.android.gms.auth.api.signin.GoogleSignInResult; import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.SignInButton; import com.google.android.gms.common.api.CommonStatusCodes; import com.google.android.gms.common.api.GoogleApiClient; import com.google.android.gms.common.api.OptionalPendingResult; @@ -42,7 +41,7 @@ public class GooglePlusNetwork extends SocialNetwork implements GoogleApiClient. private WeakReference mActivity; - private WeakReference mSignInButton; + private WeakReference mSignInButton; public GooglePlusNetwork(Activity activity) { @@ -167,7 +166,7 @@ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) { mListener.onError(getNetwork(), getStatusCodeString(connectionResult.getErrorCode())); } - public void setSignInButton(SignInButton button) { + public void setSignInButton(View button) { mSignInButton = new WeakReference<>(button); mSignInButton.get().setOnClickListener(new View.OnClickListener() { @Override diff --git a/library/src/main/java/com/maksim88/easylogin/networks/TwitterNetwork.java b/library/src/main/java/com/maksim88/easylogin/networks/TwitterNetwork.java index 4270d5c..5eaf59a 100644 --- a/library/src/main/java/com/maksim88/easylogin/networks/TwitterNetwork.java +++ b/library/src/main/java/com/maksim88/easylogin/networks/TwitterNetwork.java @@ -1,19 +1,18 @@ package com.maksim88.easylogin.networks; import android.app.Activity; -import android.content.Context; import android.content.Intent; -import android.os.Build; -import android.webkit.CookieManager; -import android.webkit.CookieSyncManager; +import android.util.Log; import com.maksim88.easylogin.AccessToken; import com.maksim88.easylogin.listener.OnLoginCompleteListener; -import com.twitter.sdk.android.Twitter; import com.twitter.sdk.android.core.Callback; +import com.twitter.sdk.android.core.DefaultLogger; import com.twitter.sdk.android.core.Result; +import com.twitter.sdk.android.core.Twitter; import com.twitter.sdk.android.core.TwitterAuthConfig; import com.twitter.sdk.android.core.TwitterAuthToken; +import com.twitter.sdk.android.core.TwitterConfig; import com.twitter.sdk.android.core.TwitterCore; import com.twitter.sdk.android.core.TwitterException; import com.twitter.sdk.android.core.TwitterSession; @@ -21,10 +20,6 @@ import java.lang.ref.WeakReference; -import io.fabric.sdk.android.Fabric; - -import static com.facebook.FacebookSdk.getApplicationContext; - /** * Created by maksim on 14.02.16. */ @@ -60,7 +55,11 @@ public void failure(TwitterException e) { public TwitterNetwork(Activity activity, String consumerKey, String consumerSecret) { TwitterAuthConfig authConfig = new TwitterAuthConfig(consumerKey, consumerSecret); - Fabric.with(activity, new Twitter(authConfig)); + TwitterConfig config = new TwitterConfig.Builder(activity.getApplicationContext()) + .logger(new DefaultLogger(Log.DEBUG)) + .twitterAuthConfig(authConfig) + .build(); + Twitter.initialize(config); } @Override @@ -88,9 +87,7 @@ private void requestLogin(TwitterLoginButton button) { public void logout() { TwitterSession twitterSession = TwitterCore.getInstance().getSessionManager().getActiveSession(); if (twitterSession != null) { - clearCookies(getApplicationContext()); - Twitter.getSessionManager().clearActiveSession(); - Twitter.logOut(); + TwitterCore.getInstance().getSessionManager().clearActiveSession(); mLoginButton.get().setEnabled(true); } } @@ -111,20 +108,4 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { mLoginButton.get().onActivityResult(requestCode, resultCode, data); } } - - @SuppressWarnings("deprecation") - private void clearCookies(Context context) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - CookieManager.getInstance().removeAllCookies(null); - CookieManager.getInstance().flush(); - } else { - CookieSyncManager cookieSyncMngr = CookieSyncManager.createInstance(context); - cookieSyncMngr.startSync(); - CookieManager cookieManager = CookieManager.getInstance(); - cookieManager.removeAllCookie(); - cookieManager.removeSessionCookie(); - cookieSyncMngr.stopSync(); - cookieSyncMngr.sync(); - } - } } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 25b2e1b..8232b3f 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -13,8 +13,6 @@ - - EasyLogin Sample MainActivity TO BE CHANGED - TO BE CHANGED