narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

always scroll if viewing intent

Browse source
This commit is contained in:
Daniel Gultsch 2018-02-26 09:53:17 +01:00
parent dfb4e4eb46
commit 74336fa165
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -341,6 +341,9 @@ public class ConversationActivity extends XmppActivity implements OnConversation
@Override @Override
public void onConversationSelected(Conversation conversation) { public void onConversationSelected(Conversation conversation) {
if (ConversationFragment.getConversation(this) == conversation) {
Log.d(Config.LOGTAG,"ignore onConversationSelected() because conversation is already open");
}
openConversation(conversation, null); openConversation(conversation, null);
} }
@ -412,6 +415,7 @@ public class ConversationActivity extends XmppActivity implements OnConversation
pendingViewIntent.push(intent); pendingViewIntent.push(intent);
} }
} }
setIntent(createLauncherIntent(this));
} }
@Override @Override

33
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1649,6 +1649,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
updateChatState(this.conversation, msg); updateChatState(this.conversation, msg);
this.activity.xmppConnectionService.getNotificationService().setOpenConversation(null); this.activity.xmppConnectionService.getNotificationService().setOpenConversation(null);
} }
this.reInitRequiredOnStart = true;
} }
private void updateChatState(final Conversation conversation, final String msg) { private void updateChatState(final Conversation conversation, final String msg) {
@ -1675,7 +1676,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
public void reInit(Conversation conversation, Bundle extras) { public void reInit(Conversation conversation, Bundle extras) {
this.saveMessageDraftStopAudioPlayer(); this.saveMessageDraftStopAudioPlayer();
if (this.reInit(conversation)) { if (this.reInit(conversation, false, extras != null)) {
if (extras != null) { if (extras != null) {
processExtras(extras); processExtras(extras);
} }
@ -1686,23 +1687,29 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
} }
} }
private boolean reInit(Conversation conversation) { private void reInit(Conversation conversation) {
return reInit(conversation, false); reInit(conversation, false, false);
} }
private boolean reInit(Conversation conversation, boolean restore) { private void reInitRestore(Conversation conversation) {
reInit(conversation, true, false);
}
private boolean reInit(Conversation conversation, boolean restore, boolean hasExtras) {
if (conversation == null) { if (conversation == null) {
return false; return false;
} }
final boolean hasChanged = this.conversation != null && this.conversation != conversation;
this.conversation = conversation; this.conversation = conversation;
//once we set the conversation all is good and it will automatically do the right thing in onStart() //once we set the conversation all is good and it will automatically do the right thing in onStart()
if (this.activity == null || this.binding == null) { if (this.activity == null || this.binding == null) {
return false; return false;
} }
Log.d(Config.LOGTAG, "reInit(restore=" + Boolean.toString(restore) + ", hasChanged=" + Boolean.toString(hasChanged) + ")"); Log.d(Config.LOGTAG, "reInit(restore=" + Boolean.toString(restore) + ", hasExtras="+Boolean.toString(hasExtras)+")");
final boolean fullReset = !restore && !hasExtras;
setupIme(); setupIme();
if (!restore && hasChanged) { if (fullReset) {
this.conversation.trim(); this.conversation.trim();
} }
@ -1712,17 +1719,23 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
this.binding.textinput.append(this.conversation.getNextMessage()); this.binding.textinput.append(this.conversation.getNextMessage());
this.binding.textinput.setKeyboardListener(this); this.binding.textinput.setKeyboardListener(this);
messageListAdapter.updatePreferences(); messageListAdapter.updatePreferences();
if (!restore && hasChanged) { if (fullReset) {
this.binding.messagesView.setAdapter(messageListAdapter); this.binding.messagesView.setAdapter(messageListAdapter);
} }
refresh(false); refresh(false);
this.conversation.messagesLoaded.set(true); this.conversation.messagesLoaded.set(true);
if (!restore && hasChanged) {
//usually on a restore we don’t want to jump unless there is no scroll state to restore anyway
//on a view intent (indicated by hasExtras) we always want to jump
final boolean jump = (!restore || pendingScrollState.peek() == null) || hasExtras;
if (jump) {
synchronized (this.messageList) { synchronized (this.messageList) {
Log.d(Config.LOGTAG,"jump to first unread message");
final Message first = conversation.getFirstUnreadMessage(); final Message first = conversation.getFirstUnreadMessage();
final int bottom = Math.max(0, this.messageList.size() - 1); final int bottom = Math.max(0, this.messageList.size() - 1);
final int pos; final int pos;
if (first == null) { if (first == null) {
Log.d(Config.LOGTAG,"first unread message was null");
pos = bottom; pos = bottom;
} else { } else {
int i = getIndexOf(first.getUuid(), this.messageList); int i = getIndexOf(first.getUuid(), this.messageList);
@ -2337,7 +2350,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
clearPending(); clearPending();
return; return;
} }
reInit(conversation, true); reInitRestore(conversation);
ScrollState scrollState = pendingScrollState.pop(); ScrollState scrollState = pendingScrollState.pop();
if (scrollState != null) { if (scrollState != null) {
setScrollPosition(scrollState); setScrollPosition(scrollState);