diff --git a/ChatMan.apk b/ChatMan.apk
index 2fbc6211602524f7fa5fbe00387c7ee3b983e0e1..ec2fc7fc547ff84e9ca4c6b5642b83ac0723d5df 100644
Binary files a/ChatMan.apk and b/ChatMan.apk differ
diff --git a/android/app/src/main/java/com/chatman/activity/AuthActivity.java b/android/app/src/main/java/com/chatman/activity/AuthActivity.java
index b793962db0358f6ddb3cfe01783eca9ac1a9acf7..26873500d51159fcdb099bd71fc4e800382ea12a 100644
--- a/android/app/src/main/java/com/chatman/activity/AuthActivity.java
+++ b/android/app/src/main/java/com/chatman/activity/AuthActivity.java
@@ -6,6 +6,8 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.AppCompatActivity;
import android.transition.TransitionManager;
import android.util.Log;
@@ -336,4 +338,9 @@ public class AuthActivity extends AppCompatActivity {
View rootView = activity.getWindow().getDecorView().findViewById(android.R.id.content);
Snackbar.make(rootView, message, Snackbar.LENGTH_SHORT).show();
}
+
+ @Override
+ public void onBackPressed() {
+ this.moveTaskToBack(true);
+ }
}
\ No newline at end of file
diff --git a/android/app/src/main/java/com/chatman/adapter/ChatListAdapter.java b/android/app/src/main/java/com/chatman/adapter/ChatListAdapter.java
index 71c24e064dbffebd94a5c1f3fdf0b1c38f1d6c1d..69f96699493c7e8946fb94e6556e929ce594efac 100644
--- a/android/app/src/main/java/com/chatman/adapter/ChatListAdapter.java
+++ b/android/app/src/main/java/com/chatman/adapter/ChatListAdapter.java
@@ -89,6 +89,7 @@ public class ChatListAdapter extends RecyclerView.Adapter<ChatListAdapter.ChatLi
public void bind(ChatList item) {
Glide.with(itemView).load(item.getAvatarResource()).into(chatListImage);
chatListLastMessage.setText(item.getLastMessage());
+
chatListName.setText(item.getName());
}
diff --git a/android/app/src/main/java/com/chatman/fragment/HomeFragment.java b/android/app/src/main/java/com/chatman/fragment/HomeFragment.java
index 7c15cf6c90f528dff4405d02c36ecccae61f2f05..b5cea8163f6dffc8cf8df3182952369dce27aa19 100644
--- a/android/app/src/main/java/com/chatman/fragment/HomeFragment.java
+++ b/android/app/src/main/java/com/chatman/fragment/HomeFragment.java
@@ -150,7 +150,7 @@ public class HomeFragment extends Fragment {
String messageId = (String) dataSnapshot.getValue();
Log.d(TAG, "onDataChange: messageId " + messageId);
FirebaseDatabase.getInstance().getReference().child("message")
- .child(messageId).addListenerForSingleValueEvent(new ValueEventListener() {
+ .child(messageId).addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
String message = (String) dataSnapshot.child("message").getValue();
@@ -239,38 +239,40 @@ public class HomeFragment extends Fragment {
public void onChildAdded(@NonNull final DataSnapshot chatRoomSnapshot, @Nullable String s) {
Log.d(TAG, "onDataChange: chatroom changed");
Log.d(TAG, "onDataChange: chatroom key " + chatRoomSnapshot.getKey());
- chatRoomSnapshot.getRef().child("users").addListenerForSingleValueEvent(new ValueEventListener() {
+ chatRoomSnapshot.getRef().child("users").addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot userSnapshot) {
Log.d(TAG, "onDataChange: users changed");
Log.d(TAG, "onDataChange: userSnapshot count " + userSnapshot.getChildrenCount());
String instanceId1 = (String) userSnapshot.child("0").getValue();
String instanceId2 = (String) userSnapshot.child("1").getValue();
- Log.d(TAG, "onDataChange: instance id " + instanceId1);
- Log.d(TAG, "onDataChange: instance id 2 " + instanceId2);
- Boolean found = false;
- if (instanceId1.equals(PreferencesHelper.getToken(mContext))) {
- found = true;
- if (instanceId2.equals("BOT_TOKEN")) {
- found = false;
+ if (instanceId1 != null && instanceId2 != null){
+ Log.d(TAG, "onDataChange: instance id " + instanceId1);
+ Log.d(TAG, "onDataChange: instance id 2 " + instanceId2);
+ Boolean found = false;
+ if (instanceId1.equals(PreferencesHelper.getToken(mContext))) {
+ found = true;
+ if (instanceId2.equals("BOT_TOKEN")) {
+ found = false;
+ }
+ Log.d(TAG, "onDataChange: user found");
+ FirebaseDatabase.getInstance().getReference().child("user").orderByChild("key").limitToFirst(1)
+ .equalTo(instanceId2).addChildEventListener(new UserChildListener(chatRoomSnapshot));
}
- Log.d(TAG, "onDataChange: user found");
- FirebaseDatabase.getInstance().getReference().child("user").orderByChild("key").limitToFirst(1)
- .equalTo(instanceId2).addChildEventListener(new UserChildListener(chatRoomSnapshot));
- }
- if (instanceId2.equals(PreferencesHelper.getToken(mContext))) {
- found = true;
- if (instanceId1.equals("BOT_TOKEN")) {
- found = false;
+ if (instanceId2.equals(PreferencesHelper.getToken(mContext))) {
+ found = true;
+ if (instanceId1.equals("BOT_TOKEN")) {
+ found = false;
+ }
+ Log.d(TAG, "onDataChange: user found 2");
+ FirebaseDatabase.getInstance().getReference().child("user").orderByChild("key").limitToFirst(1)
+ .equalTo(instanceId1).addChildEventListener(new UserChildListener(chatRoomSnapshot));
}
- Log.d(TAG, "onDataChange: user found 2");
- FirebaseDatabase.getInstance().getReference().child("user").orderByChild("key").limitToFirst(1)
- .equalTo(instanceId1).addChildEventListener(new UserChildListener(chatRoomSnapshot));
- }
- if (!found) {
- Log.d(TAG, "onDataChange: not found");
- progressBar.setVisibility(View.GONE);
+ if (!found) {
+ Log.d(TAG, "onDataChange: not found");
+ progressBar.setVisibility(View.GONE);
+ }
}
}
diff --git a/android/app/src/main/res/layout/fragment_profile.xml b/android/app/src/main/res/layout/fragment_profile.xml
index 4e0e728873f7b01889aa8391dc8d6732b751a071..93d481f58ce27e8942efd6712747c58c15655290 100644
--- a/android/app/src/main/res/layout/fragment_profile.xml
+++ b/android/app/src/main/res/layout/fragment_profile.xml
@@ -7,7 +7,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
-
+
<LinearLayout
android:id="@+id/main_content"
android:layout_width="match_parent"