Skip to content

Commit bfdb796

Browse files
samtsternsamtstern
authored
Use lambdas, remove extra type arguments (#1969)
1 parent 3401d5f commit bfdb796

File tree

70 files changed

+980
-1760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+980
-1760
lines changed

‎app/src/main/java/com/firebase/uidemo/auth/AnonymousUpgradeActivity.java

Lines changed: 25 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -57,48 +57,22 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
5757
handleSignInResult(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT, response);
5858
}
5959

60-
mBinding.anonSignIn.setOnClickListener(new View.OnClickListener() {
61-
@Override
62-
public void onClick(View view) {
63-
signInAnonymously();
64-
}
65-
});
66-
67-
mBinding.beginFlow.setOnClickListener(new View.OnClickListener() {
68-
@Override
69-
public void onClick(View view) {
70-
startAuthUI();
71-
}
72-
});
73-
74-
mBinding.resolveMerge.setOnClickListener(new View.OnClickListener() {
75-
@Override
76-
public void onClick(View view) {
77-
resolveMerge();
78-
}
79-
});
80-
81-
mBinding.signOut.setOnClickListener(new View.OnClickListener() {
82-
@Override
83-
public void onClick(View view) {
84-
signOut();
85-
}
86-
});
60+
mBinding.anonSignIn.setOnClickListener(view -> signInAnonymously());
61+
mBinding.beginFlow.setOnClickListener(view -> startAuthUI());
62+
mBinding.resolveMerge.setOnClickListener(view -> resolveMerge());
63+
mBinding.signOut.setOnClickListener(view -> signOut());
8764
}
8865

8966
public void signInAnonymously() {
9067
FirebaseAuth.getInstance().signInAnonymously()
91-
.addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
92-
@Override
93-
public void onComplete(@NonNull Task<AuthResult> task) {
94-
updateUI();
95-
96-
if (task.isSuccessful()) {
97-
setStatus("Signed in anonymously as user "
98-
+ getUserIdentifier(task.getResult().getUser()));
99-
} else {
100-
setStatus("Anonymous sign in failed.");
101-
}
68+
.addOnCompleteListener(this, task -> {
69+
updateUI();
70+
71+
if (task.isSuccessful()) {
72+
setStatus("Signed in anonymously as user "
73+
+ getUserIdentifier(task.getResult().getUser()));
74+
} else {
75+
setStatus("Anonymous sign in failed.");
10276
}
10377
});
10478
}
@@ -122,31 +96,25 @@ public void resolveMerge() {
12296
// TODO: Show how to do good data moving
12397

12498
FirebaseAuth.getInstance().signInWithCredential(mPendingCredential)
125-
.addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
126-
@Override
127-
public void onComplete(@NonNull Task<AuthResult> task) {
128-
mPendingCredential = null;
129-
updateUI();
130-
131-
if (task.isSuccessful()) {
132-
setStatus("Signed in as " + getUserIdentifier(task.getResult()
133-
.getUser()));
134-
} else {
135-
Log.w(TAG, "Merge failed", task.getException());
136-
setStatus("Failed to resolve merge conflict, see logs.");
137-
}
99+
.addOnCompleteListener(this, task -> {
100+
mPendingCredential = null;
101+
updateUI();
102+
103+
if (task.isSuccessful()) {
104+
setStatus("Signed in as " + getUserIdentifier(task.getResult()
105+
.getUser()));
106+
} else {
107+
Log.w(TAG, "Merge failed", task.getException());
108+
setStatus("Failed to resolve merge conflict, see logs.");
138109
}
139110
});
140111
}
141112

142113
public void signOut() {
143114
AuthUI.getInstance().signOut(this)
144-
.addOnCompleteListener(new OnCompleteListener<Void>() {
145-
@Override
146-
public void onComplete(@NonNull Task<Void> task) {
147-
setStatus(null);
148-
updateUI();
149-
}
115+
.addOnCompleteListener(task -> {
116+
setStatus(null);
117+
updateUI();
150118
});
151119
}
152120

‎app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

Lines changed: 30 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
9191
setGoogleScopesEnabled(false);
9292
} else {
9393
setGoogleScopesEnabled(mBinding.googleProvider.isChecked());
94-
mBinding.googleProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
95-
@Override
96-
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
97-
setGoogleScopesEnabled(checked);
98-
}
99-
});
94+
mBinding.googleProvider.setOnCheckedChangeListener((compoundButton, checked) -> setGoogleScopesEnabled(checked));
10095
}
10196

10297
if (ConfigurationUtils.isFacebookMisconfigured(this)) {
@@ -106,76 +101,45 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
106101
setFacebookPermissionsEnabled(false);
107102
} else {
108103
setFacebookPermissionsEnabled(mBinding.facebookProvider.isChecked());
109-
mBinding.facebookProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
110-
@Override
111-
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
112-
setFacebookPermissionsEnabled(checked);
113-
}
114-
});
115-
}
116-
117-
mBinding.emailLinkProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
118-
@Override
119-
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
120-
flipPasswordProviderCheckbox(isChecked);
121-
}
122-
});
104+
mBinding.facebookProvider.setOnCheckedChangeListener((compoundButton, checked) -> setFacebookPermissionsEnabled(checked));
105+
}
123106

124-
mBinding.emailProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
125-
@Override
126-
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
127-
flipEmailLinkProviderCheckbox(isChecked);
128-
}
129-
});
107+
mBinding.emailLinkProvider.setOnCheckedChangeListener((buttonView, isChecked) -> flipPasswordProviderCheckbox(isChecked));
108+
109+
mBinding.emailProvider.setOnCheckedChangeListener((buttonView, isChecked) -> flipEmailLinkProviderCheckbox(isChecked));
130110

131111
mBinding.emailLinkProvider.setChecked(false);
132112
mBinding.emailProvider.setChecked(true);
133113

134114
// The custom layout in this app only supports Email and Google providers.
135-
mBinding.customLayout.setOnCheckedChangeListener(new OnCheckedChangeListener() {
136-
@Override
137-
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
138-
if (checked) {
139-
mBinding.googleProvider.setChecked(true);
140-
mBinding.emailProvider.setChecked(true);
141-
142-
mBinding.facebookProvider.setChecked(false);
143-
mBinding.twitterProvider.setChecked(false);
144-
mBinding.emailLinkProvider.setChecked(false);
145-
mBinding.phoneProvider.setChecked(false);
146-
mBinding.anonymousProvider.setChecked(false);
147-
mBinding.microsoftProvider.setChecked(false);
148-
mBinding.yahooProvider.setChecked(false);
149-
mBinding.appleProvider.setChecked(false);
150-
mBinding.githubProvider.setChecked(false);
151-
}
115+
mBinding.customLayout.setOnCheckedChangeListener((compoundButton, checked) -> {
116+
if (checked) {
117+
mBinding.googleProvider.setChecked(true);
118+
mBinding.emailProvider.setChecked(true);
119+
120+
mBinding.facebookProvider.setChecked(false);
121+
mBinding.twitterProvider.setChecked(false);
122+
mBinding.emailLinkProvider.setChecked(false);
123+
mBinding.phoneProvider.setChecked(false);
124+
mBinding.anonymousProvider.setChecked(false);
125+
mBinding.microsoftProvider.setChecked(false);
126+
mBinding.yahooProvider.setChecked(false);
127+
mBinding.appleProvider.setChecked(false);
128+
mBinding.githubProvider.setChecked(false);
152129
}
153130
});
154131

155132
// useEmulator can't be reversed until the FirebaseApp is cleared, so we make this
156133
// checkbox "sticky" until the app is restarted
157-
mBinding.useAuthEmulator.setOnCheckedChangeListener(new OnCheckedChangeListener() {
158-
@Override
159-
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
160-
if (isChecked) {
161-
mBinding.useAuthEmulator.setEnabled(false);
162-
}
134+
mBinding.useAuthEmulator.setOnCheckedChangeListener((buttonView, isChecked) -> {
135+
if (isChecked) {
136+
mBinding.useAuthEmulator.setEnabled(false);
163137
}
164138
});
165139

166-
mBinding.signIn.setOnClickListener(new View.OnClickListener() {
167-
@Override
168-
public void onClick(View view) {
169-
signIn();
170-
}
171-
});
140+
mBinding.signIn.setOnClickListener(view -> signIn());
172141

173-
mBinding.signInSilent.setOnClickListener(new View.OnClickListener() {
174-
@Override
175-
public void onClick(View view) {
176-
silentSignIn();
177-
}
178-
});
142+
mBinding.signInSilent.setOnClickListener(view -> silentSignIn());
179143

180144
if (ConfigurationUtils.isGoogleMisconfigured(this)
181145
|| ConfigurationUtils.isFacebookMisconfigured(this)) {
@@ -274,14 +238,11 @@ private Intent getSignInIntent(@Nullable String link) {
274238

275239
public void silentSignIn() {
276240
getAuthUI().silentSignIn(this, getSelectedProviders())
277-
.addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
278-
@Override
279-
public void onComplete(@NonNull Task<AuthResult> task) {
280-
if (task.isSuccessful()) {
281-
startSignedInActivity(null);
282-
} else {
283-
showSnackbar(R.string.sign_in_failed);
284-
}
241+
.addOnCompleteListener(this, task -> {
242+
if (task.isSuccessful()) {
243+
startSignedInActivity(null);
244+
} else {
245+
showSnackbar(R.string.sign_in_failed);
285246
}
286247
});
287248
}

‎app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -82,63 +82,42 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
8282
populateProfile(response);
8383
populateIdpToken(response);
8484

85-
mBinding.deleteAccount.setOnClickListener(new View.OnClickListener() {
86-
@Override
87-
public void onClick(View view) {
88-
deleteAccountClicked();
89-
}
90-
});
85+
mBinding.deleteAccount.setOnClickListener(view -> deleteAccountClicked());
9186

92-
mBinding.signOut.setOnClickListener(new View.OnClickListener() {
93-
@Override
94-
public void onClick(View view) {
95-
signOut();
96-
}
97-
});
87+
mBinding.signOut.setOnClickListener(view -> signOut());
9888
}
9989

10090
public void signOut() {
10191
AuthUI.getInstance()
10292
.signOut(this)
103-
.addOnCompleteListener(new OnCompleteListener<Void>() {
104-
@Override
105-
public void onComplete(@NonNull Task<Void> task) {
106-
if (task.isSuccessful()) {
107-
startActivity(AuthUiActivity.createIntent(SignedInActivity.this));
108-
finish();
109-
} else {
110-
Log.w(TAG, "signOut:failure", task.getException());
111-
showSnackbar(R.string.sign_out_failed);
112-
}
93+
.addOnCompleteListener(task -> {
94+
if (task.isSuccessful()) {
95+
startActivity(AuthUiActivity.createIntent(SignedInActivity.this));
96+
finish();
97+
} else {
98+
Log.w(TAG, "signOut:failure", task.getException());
99+
showSnackbar(R.string.sign_out_failed);
113100
}
114101
});
115102
}
116103

117104
public void deleteAccountClicked() {
118105
new AlertDialog.Builder(this)
119106
.setMessage("Are you sure you want to delete this account?")
120-
.setPositiveButton("Yes, nuke it!", new DialogInterface.OnClickListener() {
121-
@Override
122-
public void onClick(DialogInterface dialogInterface, int i) {
123-
deleteAccount();
124-
}
125-
})
107+
.setPositiveButton("Yes, nuke it!", (dialogInterface, i) -> deleteAccount())
126108
.setNegativeButton("No", null)
127109
.show();
128110
}
129111

130112
private void deleteAccount() {
131113
AuthUI.getInstance()
132114
.delete(this)
133-
.addOnCompleteListener(this, new OnCompleteListener<Void>() {
134-
@Override
135-
public void onComplete(@NonNull Task<Void> task) {
136-
if (task.isSuccessful()) {
137-
startActivity(AuthUiActivity.createIntent(SignedInActivity.this));
138-
finish();
139-
} else {
140-
showSnackbar(R.string.delete_account_failed);
141-
}
115+
.addOnCompleteListener(this, task -> {
116+
if (task.isSuccessful()) {
117+
startActivity(AuthUiActivity.createIntent(SignedInActivity.this));
118+
finish();
119+
} else {
120+
showSnackbar(R.string.delete_account_failed);
142121
}
143122
});
144123
}

‎app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -65,34 +65,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
6565
mBinding.messagesList.setHasFixedSize(true);
6666
mBinding.messagesList.setLayoutManager(manager);
6767

68-
mBinding.messagesList.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
69-
@Override
70-
public void onLayoutChange(View view, int left, int top, int right, int bottom,
71-
int oldLeft, int oldTop, int oldRight, int oldBottom) {
72-
if (bottom < oldBottom) {
73-
mBinding.messagesList.postDelayed(new Runnable() {
74-
@Override
75-
public void run() {
76-
mBinding.messagesList.smoothScrollToPosition(0);
77-
}
78-
}, 100);
79-
}
68+
mBinding.messagesList.addOnLayoutChangeListener((view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
69+
if (bottom < oldBottom) {
70+
mBinding.messagesList.postDelayed(() -> mBinding.messagesList.smoothScrollToPosition(
71+
0), 100);
8072
}
8173
});
8274

83-
ImeHelper.setImeOnDoneListener(mBinding.messageEdit, new ImeHelper.DonePressedListener() {
84-
@Override
85-
public void onDonePressed() {
86-
onSendClick();
87-
}
88-
});
75+
ImeHelper.setImeOnDoneListener(mBinding.messageEdit, () -> onSendClick());
8976

90-
mBinding.sendButton.setOnClickListener(new View.OnClickListener() {
91-
@Override
92-
public void onClick(View view) {
93-
onSendClick();
94-
}
95-
});
77+
mBinding.sendButton.setOnClickListener(view -> onSendClick());
9678
}
9779

9880
@Override
@@ -180,11 +162,7 @@ public void onDataChanged() {
180162
}
181163

182164
private void onAddMessage(@NonNull Chat chat) {
183-
sChatCollection.add(chat).addOnFailureListener(this, new OnFailureListener() {
184-
@Override
185-
public void onFailure(@NonNull Exception e) {
186-
Log.e(TAG, "Failed to write message", e);
187-
}
188-
});
165+
sChatCollection.add(chat).addOnFailureListener(this,
166+
e -> Log.e(TAG, "Failed to write message", e));
189167
}
190168
}

0 commit comments

Comments
 (0)