Skip to content

Commit 90e1e5f

Browse files
committed
Fixed back button
1 parent 0b102a6 commit 90e1e5f

File tree

1 file changed

+38
-23
lines changed

1 file changed

+38
-23
lines changed

app/src/main/java/com/example/chatfull/ChatActivity.java

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.flask.colorpicker.OnColorSelectedListener;
3939
import com.flask.colorpicker.builder.ColorPickerClickListener;
4040
import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
41+
import com.google.android.material.snackbar.Snackbar;
4142
import com.google.gson.Gson;
4243
import com.stfalcon.chatkit.commons.ImageLoader;
4344
import com.stfalcon.chatkit.messages.MessageHolders;
@@ -160,6 +161,9 @@ public void loadImage(ImageView imageView, @Nullable String url, @Nullable Objec
160161

161162
adapter.setOnMessageLongClickListener(this);
162163
loaded = false;
164+
btnSend.setEnabled(true);
165+
btnAttachment.setEnabled(true);
166+
btnImage.setEnabled(true);
163167
}
164168

165169
@Override
@@ -433,32 +437,40 @@ public void setMessage(final Message msg) {
433437
sender.cancel(true);
434438
if (messageReceiveServer != null)
435439
messageReceiveServer.onDestroy();
436-
this.finish();
437-
return;
438-
}
439-
440-
runOnUiThread(new Runnable() {
441-
@Override
442-
public void run() {
443-
if (msg.getText() != null) {
444-
msg.setUser(user);
445-
adapter.addToStart(msg, true);
446-
messageArrayList.add(msg);
447-
} else if (msg.isImage()) {
448-
msg.setUser(user);
449-
adapter.addToStart(msg, true);
450-
messageArrayList.add(msg);
451-
} else if (msg.isFile()) {
452-
msg.setUser(user);
453-
adapter.addToStart(msg, true);
454-
messageArrayList.add(msg);
455-
} else if (msg.isColor()) {
456-
back_view.setBackgroundColor(msg.getColor());
440+
runOnUiThread(new Runnable() {
441+
@Override
442+
public void run() {
443+
Snackbar.make(btnSend, user.getName() + " is Offline. Messages will not be sent.", Snackbar.LENGTH_INDEFINITE)
444+
.show();
445+
btnSend.setEnabled(false);
446+
btnAttachment.setEnabled(false);
447+
btnImage.setEnabled(false);
457448
}
449+
});
450+
} else {
451+
runOnUiThread(new Runnable() {
452+
@Override
453+
public void run() {
454+
if (msg.getText() != null) {
455+
msg.setUser(user);
456+
adapter.addToStart(msg, true);
457+
messageArrayList.add(msg);
458+
} else if (msg.isImage()) {
459+
msg.setUser(user);
460+
adapter.addToStart(msg, true);
461+
messageArrayList.add(msg);
462+
} else if (msg.isFile()) {
463+
msg.setUser(user);
464+
adapter.addToStart(msg, true);
465+
messageArrayList.add(msg);
466+
} else if (msg.isColor()) {
467+
back_view.setBackgroundColor(msg.getColor());
468+
}
458469

459470

460-
}
461-
});
471+
}
472+
});
473+
}
462474
}
463475

464476
@Override
@@ -484,6 +496,9 @@ protected void onPause() {
484496

485497
@Override
486498
public void onBackPressed() {
499+
btnSend.setEnabled(true);
500+
btnAttachment.setEnabled(true);
501+
btnImage.setEnabled(true);
487502
Log.e("CHAT_ACTIVITY", "PAUSE");
488503
if(saved == false) {
489504
String jsonDataString = gson.toJson(messageArrayList);

0 commit comments

Comments
 (0)