mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-27 17:08:34 +03:00
parent
195c70606f
commit
7f63476669
1 changed files with 5 additions and 26 deletions
|
@ -43,7 +43,6 @@ import android.view.MenuInflater;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.view.inputmethod.EditorInfo;
|
|
||||||
import android.widget.AbsListView;
|
import android.widget.AbsListView;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
|
@ -756,18 +755,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
boolean foundRealMessage = false;
|
|
||||||
|
|
||||||
if (conversationUser.hasSpreedCapabilityWithName("system-messages")) {
|
|
||||||
for (int i = 0; i < chatMessageList.size(); i++) {
|
|
||||||
if (TextUtils.isEmpty(chatMessageList.get(i).getSystemMessage())) {
|
|
||||||
foundRealMessage = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (foundRealMessage) {
|
|
||||||
if (emptyLayout != null) {
|
if (emptyLayout != null) {
|
||||||
emptyLayout.setVisibility(View.GONE);
|
emptyLayout.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
|
@ -775,15 +762,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
|
||||||
if (messagesListView != null) {
|
if (messagesListView != null) {
|
||||||
messagesListView.setVisibility(View.VISIBLE);
|
messagesListView.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if (emptyLayout != null && emptyLayout.getVisibility() != View.VISIBLE) {
|
|
||||||
emptyLayout.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (messagesListView != null && messagesListView.getVisibility() != View.GONE) {
|
|
||||||
messagesListView.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (emptyLayout != null) {
|
if (emptyLayout != null) {
|
||||||
|
|
Loading…
Reference in a new issue