Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Commit

Permalink
Removed Google Guava dependency from firebase_auth. (#762)
Browse files Browse the repository at this point in the history 
* Removed Google Guava dependency.

* Fix formatting.

* Fixed more formatted.
  • Loading branch information
@slightfoot @dnfield
slightfoot authored and dnfield committed Sep 5, 2018
1 parent b7ba85a commit a2af960
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 31 deletions.
1 change: 0 additions & 1 deletion packages/firebase_auth/android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ android {
disable 'InvalidPackage'
}
dependencies {
implementation 'com.google.guava:guava:20.0'
api 'com.google.firebase:firebase-auth:16.0.2'
}
}
56 changes: 26 additions & 30 deletions ...rebase_auth/android/src/main/java/io/flutter/plugins/firebaseauth/FirebaseAuthPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import android.util.SparseArray;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.firebase.FirebaseApiNotAvailableException;
import com.google.firebase.FirebaseApp;
import com.google.firebase.FirebaseException;
Expand All @@ -21,6 +19,8 @@
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
import io.flutter.plugin.common.MethodChannel.Result;
import io.flutter.plugin.common.PluginRegistry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -263,7 +263,7 @@ private void handleCurrentUser(MethodCall call, final Result result) {
public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
firebaseAuth.removeAuthStateListener(this);
FirebaseUser user = firebaseAuth.getCurrentUser();
ImmutableMap<String, Object> userMap = mapFromUser(user);
Map<String, Object> userMap = mapFromUser(user);
result.success(userMap);
}
};
Expand Down Expand Up @@ -482,14 +482,14 @@ private void handleStartListeningAuthState(MethodCall call, final Result result)
@Override
public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
FirebaseUser user = firebaseAuth.getCurrentUser();
ImmutableMap<String, Object> userMap = mapFromUser(user);
ImmutableMap.Builder<String, Object> builder =
ImmutableMap.<String, Object>builder().put("id", handle);
Map<String, Object> userMap = mapFromUser(user);
Map<String, Object> map = new HashMap<>();
map.put("id", handle);

if (userMap != null) {
builder.put("user", userMap);
map.put("user", userMap);
}
channel.invokeMethod("onAuthStateChanged", builder.build());
channel.invokeMethod("onAuthStateChanged", Collections.unmodifiableMap(map));
}
};
FirebaseAuth.getInstance().addAuthStateListener(listener);
Expand Down Expand Up @@ -537,7 +537,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
result.error(ERROR_REASON_EXCEPTION, e.getMessage(), null);
} else {
FirebaseUser user = task.getResult().getUser();
ImmutableMap<String, Object> userMap = mapFromUser(user);
Map<String, Object> userMap = Collections.unmodifiableMap(mapFromUser(user));
result.success(userMap);
}
}
Expand Down Expand Up @@ -580,44 +580,40 @@ public void onComplete(@NonNull Task<ProviderQueryResult> task) {
}
}

private ImmutableMap.Builder<String, Object> userInfoToMap(UserInfo userInfo) {
ImmutableMap.Builder<String, Object> builder =
ImmutableMap.<String, Object>builder()
.put("providerId", userInfo.getProviderId())
.put("uid", userInfo.getUid());
private Map<String, Object> userInfoToMap(UserInfo userInfo) {
Map<String, Object> map = new HashMap<>();
map.put("providerId", userInfo.getProviderId());
map.put("uid", userInfo.getUid());
if (userInfo.getDisplayName() != null) {
builder.put("displayName", userInfo.getDisplayName());
map.put("displayName", userInfo.getDisplayName());
}
if (userInfo.getPhotoUrl() != null) {
builder.put("photoUrl", userInfo.getPhotoUrl().toString());
map.put("photoUrl", userInfo.getPhotoUrl().toString());
}
if (userInfo.getEmail() != null) {
builder.put("email", userInfo.getEmail());
map.put("email", userInfo.getEmail());
}
if (userInfo.getPhoneNumber() != null) {
builder.put("phoneNumber", userInfo.getPhoneNumber());
map.put("phoneNumber", userInfo.getPhoneNumber());
}
return builder;
return map;
}

private ImmutableMap<String, Object> mapFromUser(FirebaseUser user) {
private Map<String, Object> mapFromUser(FirebaseUser user) {
if (user != null) {
ImmutableList.Builder<ImmutableMap<String, Object>> providerDataBuilder =
ImmutableList.<ImmutableMap<String, Object>>builder();
List<Map<String, Object>> providerData = new ArrayList<>();
for (UserInfo userInfo : user.getProviderData()) {
// Ignore phone provider since firebase provider is a super set of the phone provider.
if (userInfo.getProviderId().equals("phone")) {
continue;
}
providerDataBuilder.add(userInfoToMap(userInfo).build());
providerData.add(Collections.unmodifiableMap(userInfoToMap(userInfo)));
}
ImmutableMap<String, Object> userMap =
userInfoToMap(user)
.put("isAnonymous", user.isAnonymous())
.put("isEmailVerified", user.isEmailVerified())
.put("providerData", providerDataBuilder.build())
.build();
return userMap;
Map<String, Object> userMap = userInfoToMap(user);
userMap.put("isAnonymous", user.isAnonymous());
userMap.put("isEmailVerified", user.isEmailVerified());
userMap.put("providerData", Collections.unmodifiableList(providerData));
return Collections.unmodifiableMap(userMap);
} else {
return null;
}
Expand Down

0 comments on commit a2af960

Please sign in to comment.