From 0c7e146ae8a57066c46fe4bbcabc295907852cbe Mon Sep 17 00:00:00 2001
From: melvinabraham <melvin.abraham1996@gmail.com>
Date: Mon, 24 Apr 2017 06:59:02 +0530
Subject: [PATCH] Fixed Bugs
---
.../java/com/mapps/seproject/CameraFragment.java | 12 +++---------
.../java/com/mapps/seproject/ComposeFragment.java | 4 ++--
.../main/java/com/mapps/seproject/MainActivity.java | 8 ++++----
.../java/com/mapps/seproject/RegisterActivity.java | 4 ++--
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/mapps/seproject/CameraFragment.java b/app/src/main/java/com/mapps/seproject/CameraFragment.java
index f63c46a..6c6f101 100644
--- a/app/src/main/java/com/mapps/seproject/CameraFragment.java
+++ b/app/src/main/java/com/mapps/seproject/CameraFragment.java
@@ -60,7 +60,7 @@ public class CameraFragment extends Fragment {
private Button btnCapturePicture;
private Button choose_image;
StorageReference mStorageRef;
- Button signOut;
+
FirebaseUser user;
FirebaseAuth firebaseAuth;
@@ -76,7 +76,8 @@ public class CameraFragment extends Fragment {
mStorageRef = FirebaseStorage.getInstance().getReference();
btnCapturePicture = (Button) view.findViewById(R.id.btnCapturePicture);
- signOut = (Button) view.findViewById(R.id.bSignOut);
+
+
choose_image = (Button) view.findViewById(R.id.choose_image);
btnCapturePicture.setOnClickListener(new View.OnClickListener() {
@@ -94,13 +95,6 @@ public class CameraFragment extends Fragment {
}
});
- signOut.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- firebaseAuth.signOut();
- startActivity(new Intent(getActivity(),StartActivty.class));
- }
- });
return view;
diff --git a/app/src/main/java/com/mapps/seproject/ComposeFragment.java b/app/src/main/java/com/mapps/seproject/ComposeFragment.java
index a2f215d..6ef0f31 100644
--- a/app/src/main/java/com/mapps/seproject/ComposeFragment.java
+++ b/app/src/main/java/com/mapps/seproject/ComposeFragment.java
@@ -91,12 +91,12 @@ public class ComposeFragment extends Fragment implements View.OnClickListener{
bComposeMail = (Button) view.findViewById(R.id.bComposeMail);
emailText = (TextView) view.findViewById(R.id.tvEmailMessage);
- //b_get = (Button) view.findViewById(R.id.button2);
+
bComposeMail.setOnClickListener(this);
- //b_get.setOnClickListener(this);
+
return view;
}
diff --git a/app/src/main/java/com/mapps/seproject/MainActivity.java b/app/src/main/java/com/mapps/seproject/MainActivity.java
index 39784d7..19dd84f 100644
--- a/app/src/main/java/com/mapps/seproject/MainActivity.java
+++ b/app/src/main/java/com/mapps/seproject/MainActivity.java
@@ -33,7 +33,7 @@ public class MainActivity extends AppCompatActivity {
FragmentManager fragmentManager;
FragmentTransaction fragmentTransaction;
FirebaseAuth firebaseAuth;
- EditText getname;
+
int flag = 0;
FirebaseDatabase database = FirebaseDatabase.getInstance();
DatabaseReference myRef = database.getReference("message");
@@ -81,7 +81,7 @@ public class MainActivity extends AppCompatActivity {
mDatabase.child(userId).setValue(user);
*/
- getname = RegisterActivity.name;
+
mDatabase.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(DataSnapshot dataSnapshot) {
@@ -111,7 +111,7 @@ public class MainActivity extends AppCompatActivity {
if(flag == 0) {
userId = mDatabase.push().getKey();
- User user = new User(data,getname.getText().toString(),location,complaint);
+ User user = new User(data,RegisterActivity.name.getText().toString(),location,complaint);
mDatabase.child(userId).setValue(user);
Log.e("E","new");
}
@@ -121,7 +121,7 @@ public class MainActivity extends AppCompatActivity {
@Override
public void onCancelled(DatabaseError databaseError) {
- System.out.println("The read failed" + databaseError.getMessage());
+ System.out.println("The re ad failed" + databaseError.getMessage());
}
});
diff --git a/app/src/main/java/com/mapps/seproject/RegisterActivity.java b/app/src/main/java/com/mapps/seproject/RegisterActivity.java
index 26ff3c8..67072e8 100644
--- a/app/src/main/java/com/mapps/seproject/RegisterActivity.java
+++ b/app/src/main/java/com/mapps/seproject/RegisterActivity.java
@@ -34,7 +34,7 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_register);
-
+ name = (EditText) findViewById(R.id.etName);
firebaseAuth = FirebaseAuth.getInstance();
@@ -85,7 +85,7 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
progress.setMessage("Registering"); // Progress Bar
progress.show();
- name = (EditText) findViewById(R.id.etName);
+
try {
firebaseAuth.createUserWithEmailAndPassword(mail, pass) // Create New Entry
--
GitLab