Merge pull request #51 from ACM-student-chapter-UOM/bluetooth-ID

Bluetooth-ID
ACM-student-chapter-UOM · May 27, 2020 · 2934db7 · 2934db7
2 parents 36a96de + 0097235
commit 2934db7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/mobile-app/app/src/main/java/com/example/acmcovidapplication/db/FirebaseHelper.java b/mobile-app/app/src/main/java/com/example/acmcovidapplication/db/FirebaseHelper.java
@@ -73,6 +73,7 @@ public void onFailure(@NonNull Exception e) {
     public void onCreteUser(String id){
         Map<String, Object> data = new HashMap<>();
         data.put("bluetooth id",id);
+        firebaseUser = FirebaseAuth.getInstance().getCurrentUser();
 
         db.collection("users")
                 .document(firebaseUser.getUid())

diff --git a/mobile-app/app/src/main/java/com/example/acmcovidapplication/otp_entering.java b/mobile-app/app/src/main/java/com/example/acmcovidapplication/otp_entering.java
@@ -10,6 +10,7 @@
 import android.widget.Toast;
 
 import com.example.acmcovidapplication.db.DatabaseHelper;
+import com.example.acmcovidapplication.db.FirebaseHelper;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskExecutors;
@@ -26,6 +27,8 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import static com.example.acmcovidapplication.Util.generateHash;
+
 
 public class otp_entering extends AppCompatActivity {
     private EditText code_1;
@@ -38,6 +41,7 @@ public class otp_entering extends AppCompatActivity {
     private String verificationId;
     private FirebaseAuth mAuth;
     PhoneAuthProvider.ForceResendingToken token;
+    FirebaseHelper firebasehelper = new FirebaseHelper();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -189,9 +193,10 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                             Intent intent = new Intent(otp_entering.this, appPermission.class);
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                             startActivity(intent);
-                            String userId = Util.generateHash(phoneNumber,otp_entering.this);
+                            String userId = generateHash(phoneNumber,otp_entering.this);
                             Context context = otp_entering.this;
                             DatabaseHelper.getInstance(otp_entering.this).insertUserId(userId);
+                            firebasehelper.onCreteUser(generateHash(phoneNumber,otp_entering.this));
                         } else {
                             Toast.makeText(otp_entering.this, task.getException().getMessage(), Toast.LENGTH_LONG).show();
                         }