Skip to content

Commit 4f5c675

Browse files
committed
Update Facebook sdk (remove sdkInitialize) and update easy perms
Signed-off-by: Alex Saveau <[email protected]>
1 parent 8a3f6a3 commit 4f5c675

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies {
4242
// The following dependencies are not required to use the Firebase UI library.
4343
// They are used to make some aspects of the demo app implementation simpler for
4444
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
45-
compile 'pub.devrel:easypermissions:0.2.1'
45+
compile 'pub.devrel:easypermissions:0.3.0'
4646
compile 'com.jakewharton:butterknife:8.5.1'
4747
apt 'com.jakewharton:butterknife-compiler:8.5.1'
4848
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'

auth/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
compile "com.google.firebase:firebase-auth:$firebase_version"
3737
compile "com.google.android.gms:play-services-auth:$firebase_version"
3838

39-
compile 'com.facebook.android:facebook-android-sdk:4.18.0'
39+
compile 'com.facebook.android:facebook-android-sdk:4.19.0'
4040
compile("com.twitter.sdk.android:twitter:2.3.0@aar") { transitive = true }
4141

4242
// The following libraries are needed to prevent incompatibilities with the facebook
@@ -45,7 +45,7 @@ dependencies {
4545

4646
testCompile 'junit:junit:4.12'
4747
//noinspection NewerVersionAvailable, GradleDynamicVersion
48-
testCompile 'org.mockito:mockito-core:2.5.+'
48+
testCompile 'org.mockito:mockito-core:2.6.+'
4949
testCompile 'org.robolectric:robolectric:3.2.2'
5050
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
5151
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.support.annotation.StyleRes;
2525
import android.support.annotation.VisibleForTesting;
2626

27-
import com.facebook.FacebookSdk;
2827
import com.facebook.login.LoginManager;
2928
import com.firebase.ui.auth.ui.FlowParameters;
3029
import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
@@ -347,9 +346,7 @@ public Void then(@NonNull Task<GoogleApiClient> task) throws Exception {
347346
});
348347

349348
// Facebook sign out
350-
if (FacebookSdk.isInitialized()) {
351-
LoginManager.getInstance().logOut();
352-
}
349+
LoginManager.getInstance().logOut();
353350

354351
// Wait for all tasks to complete
355352
return Tasks.whenAll(disableCredentialsTask, googleSignOutTask);

auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,14 @@ public FacebookProvider(Context context, AuthUI.IdpConfig idpConfig, @StyleRes i
7171
} else {
7272
mScopes = scopes;
7373
}
74-
FacebookSdk.sdkInitialize(appContext);
7574
FacebookSdk.setWebDialogTheme(theme);
7675
}
7776

7877
public static AuthCredential createAuthCredential(IdpResponse response) {
7978
if (!response.getProviderType().equals(FacebookAuthProvider.PROVIDER_ID)) {
8079
return null;
8180
}
82-
return FacebookAuthProvider
83-
.getCredential(response.getIdpToken());
81+
return FacebookAuthProvider.getCredential(response.getIdpToken());
8482
}
8583

8684
@Override

0 commit comments

Comments
 (0)