sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplified reInit logic

This commit is contained in:
Daniel Gultsch 2018-02-26 11:40:06 +01:00
parent bd2417e792
commit fe8e131e3a
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -369,7 +369,7 @@ public class ConversationActivity extends XmppActivity implements OnConversation
} else { } else {
mainNeedsRefresh = true; mainNeedsRefresh = true;
} }
conversationFragment.reInit(conversation, extras); conversationFragment.reInit(conversation, extras == null ? new Bundle() : extras);
if (mainNeedsRefresh) { if (mainNeedsRefresh) {
refreshFragment(R.id.main_fragment); refreshFragment(R.id.main_fragment);
} else { } else {

30
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -1624,8 +1624,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
if (this.reInitRequiredOnStart) { if (this.reInitRequiredOnStart) {
reInit(conversation);
final Bundle extras = pendingExtras.pop(); final Bundle extras = pendingExtras.pop();
reInit(conversation, extras != null);
if (extras != null) { if (extras != null) {
processExtras(extras); processExtras(extras);
} }
@ -1676,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, false, extras != null)) { if (this.reInit(conversation, extras != null)) {
if (extras != null) { if (extras != null) {
processExtras(extras); processExtras(extras);
} }
@ -1688,14 +1688,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
} }
private void reInit(Conversation conversation) { private void reInit(Conversation conversation) {
reInit(conversation, false, false); reInit(conversation, false);
} }
private void reInitRestore(Conversation conversation) { private boolean reInit(final Conversation conversation, final boolean hasExtras) {
reInit(conversation, true, false);
}
private boolean reInit(Conversation conversation, boolean restore, boolean hasExtras) {
if (conversation == null) { if (conversation == null) {
return false; return false;
} }
@ -1704,14 +1700,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
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) + ", hasExtras="+Boolean.toString(hasExtras)+")"); Log.d(Config.LOGTAG,"reInit(hasExtras="+Boolean.toString(hasExtras)+")");
final boolean fullReset = !restore && !hasExtras;
setupIme(); setupIme();
if (fullReset) {
this.conversation.trim();
}
this.binding.textSendButton.setContentDescription(activity.getString(R.string.send_message_to_x, conversation.getName())); this.binding.textSendButton.setContentDescription(activity.getString(R.string.send_message_to_x, conversation.getName()));
this.binding.textinput.setKeyboardListener(null); this.binding.textinput.setKeyboardListener(null);
@ -1719,16 +1709,10 @@ 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 (fullReset) {
this.binding.messagesView.setAdapter(messageListAdapter);
}
refresh(false); refresh(false);
this.conversation.messagesLoaded.set(true); this.conversation.messagesLoaded.set(true);
//usually on a restore we don’t want to jump unless there is no scroll state to restore anyway if (hasExtras) {
//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"); Log.d(Config.LOGTAG,"jump to first unread message");
final Message first = conversation.getFirstUnreadMessage(); final Message first = conversation.getFirstUnreadMessage();
@ -2350,7 +2334,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
clearPending(); clearPending();
return; return;
} }
reInitRestore(conversation); reInit(conversation);
ScrollState scrollState = pendingScrollState.pop(); ScrollState scrollState = pendingScrollState.pop();
if (scrollState != null) { if (scrollState != null) {
setScrollPosition(scrollState); setScrollPosition(scrollState);