Skip to content

Commit da5a5f5

Browse files
committed
Add Firestore and RealtimeDatabase
1 parent 311e87f commit da5a5f5

5 files changed

Lines changed: 43 additions & 23 deletions

File tree

sjfirebase/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,17 @@ dependencies {
5454
testImplementation(libs.junit)
5555
androidTestImplementation(libs.androidx.test.ext.junit)
5656
androidTestImplementation(libs.espresso.core)
57-
dependencies {
5857
// Import the BoM for the Firebase platform
5958
implementation(platform("com.google.firebase:firebase-bom:32.6.0"))
6059

6160
// Add the dependency for the Firebase Authentication library
6261
// When using the BoM, you don't specify versions in Firebase library dependencies
6362
//noinspection UseTomlInstead
6463
implementation("com.google.firebase:firebase-auth")
65-
}
64+
//noinspection UseTomlInstead
65+
implementation("com.google.firebase:firebase-firestore")
66+
//noinspection UseTomlInstead
67+
implementation("com.google.firebase:firebase-database")
68+
//noinspection UseTomlInstead
69+
implementation("com.google.firebase:firebase-storage")
6670
}

sjfirebase/src/main/java/com/simplejnius/sjfirebase/SJFirebaseAuthEmail.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ public boolean check_user_signed_in() {
2929
}
3030

3131
public void create_user_with_email_and_password(
32-
String email, String password, Object callback) {
32+
String email, String password, OnCompleteListener<AuthResult> callback) {
3333
m_auth.createUserWithEmailAndPassword(email, password)
34-
.addOnCompleteListener((OnCompleteListener<AuthResult>) callback);
34+
.addOnCompleteListener(callback);
3535
}
3636

37-
public void sign_in_with_email_and_password(String email, String password, Object callback) {
37+
public void sign_in_with_email_and_password(
38+
String email, String password, OnCompleteListener<AuthResult> callback) {
3839
m_auth.signInWithEmailAndPassword(email, password)
39-
.addOnCompleteListener((OnCompleteListener<AuthResult>) callback);
40+
.addOnCompleteListener(callback);
4041
}
4142
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.simplejnius.sjfirebase;
2+
3+
import com.google.firebase.database.FirebaseDatabase;
4+
5+
public class SJFirebaseDatabase {
6+
public FirebaseDatabase get_db() {
7+
return FirebaseDatabase.getInstance();
8+
}
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.simplejnius.sjfirebase;
2+
3+
import com.google.firebase.firestore.FirebaseFirestore;
4+
5+
public class SJFirebaseFirestore {
6+
public FirebaseFirestore get_db() {
7+
return FirebaseFirestore.getInstance();
8+
}
9+
}

sjfirebase/src/main/java/com/simplejnius/sjfirebase/SJFirebaseUser.java

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@
77
import com.google.firebase.auth.AuthCredential;
88
import com.google.firebase.auth.EmailAuthProvider;
99
import com.google.firebase.auth.FirebaseAuth;
10-
import com.google.firebase.auth.FirebaseAuthRecentLoginRequiredException;
1110
import com.google.firebase.auth.FirebaseUser;
1211
import com.google.firebase.auth.UserProfileChangeRequest;
1312

14-
import java.util.Objects;
15-
1613
public class SJFirebaseUser {
1714

1815
public FirebaseUser get_current_user() {
1916
return FirebaseAuth.getInstance().getCurrentUser();
2017
}
2118

22-
public void update_profile(String name, String photo_url, Object callback) {
19+
public void update_profile(String name, String photo_url, OnCompleteListener<Void> callback) {
2320
// [START update_profile]
2421
UserProfileChangeRequest.Builder profile_updates = new UserProfileChangeRequest.Builder();
2522
UserProfileChangeRequest user_profile_change_request;
@@ -35,24 +32,24 @@ public void update_profile(String name, String photo_url, Object callback) {
3532
}
3633

3734
get_current_user().updateProfile(user_profile_change_request)
38-
.addOnCompleteListener((OnCompleteListener<Void>) callback);
35+
.addOnCompleteListener(callback);
3936
// [END update_profile]
4037
}
4138

42-
public void update_email(String email, Object callback) {
39+
public void update_email(String email, OnCompleteListener<Void> callback) {
4340
get_current_user().updateEmail(email)
44-
.addOnCompleteListener((OnCompleteListener<Void>) callback);
41+
.addOnCompleteListener(callback);
4542
}
4643

47-
public void send_email_verification(Object callback) {
44+
public void send_email_verification(OnCompleteListener<Void> callback) {
4845
// [START send_email_verification]
4946
get_current_user().sendEmailVerification()
50-
.addOnCompleteListener((OnCompleteListener<Void>) callback);
47+
.addOnCompleteListener(callback);
5148
// [END send_email_verification]
5249
}
5350

5451
public void send_email_verification_with_continue_url(
55-
String app_package_name, String url, Object callback) {
52+
String app_package_name, String url, OnCompleteListener<Void> callback) {
5653
// [START send_email_verification_with_continue_url]
5754
ActionCodeSettings actionCodeSettings = ActionCodeSettings.newBuilder()
5855
.setUrl(url)
@@ -62,27 +59,27 @@ public void send_email_verification_with_continue_url(
6259
.build();
6360

6461
get_current_user().sendEmailVerification(actionCodeSettings)
65-
.addOnCompleteListener((OnCompleteListener<Void>) callback);
62+
.addOnCompleteListener(callback);
6663
}
6764

68-
public void send_password_reset_email(String email, Object callback) {
65+
public void send_password_reset_email(String email, OnCompleteListener<Void> callback) {
6966
// [START send_password_reset]
7067
FirebaseAuth auth = FirebaseAuth.getInstance();
7168

7269
auth.sendPasswordResetEmail(email)
73-
.addOnCompleteListener((OnCompleteListener<Void>) callback);
70+
.addOnCompleteListener(callback);
7471
// [END send_password_reset]
7572
}
7673

77-
public void deleteUser(Object callback) {
74+
public void deleteUser(OnCompleteListener<Void> callback) {
7875
// [START delete_user]
7976

8077
get_current_user().delete()
81-
.addOnCompleteListener((OnCompleteListener<Void>) callback);
78+
.addOnCompleteListener(callback);
8279
// [END delete_user]
8380
}
8481

85-
public void reauthenticate(String email, String password, Object callback) {
82+
public void reauthenticate(String email, String password, OnCompleteListener<Void> callback) {
8683
// [START reauthenticate]
8784

8885
// Get auth credentials from the user for re-authentication. The example below shows
@@ -93,7 +90,7 @@ public void reauthenticate(String email, String password, Object callback) {
9390

9491
// Prompt the user to re-provide their sign-in credentials
9592
get_current_user().reauthenticate(credential)
96-
.addOnCompleteListener((OnCompleteListener<Void>) callback);
93+
.addOnCompleteListener(callback);
9794
// [END reauthenticate]
9895
}
9996
}

0 commit comments

Comments
 (0)