moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-26 01:09:13 -05:00
Code Issues Releases Wiki Activity

make ConversationsActivity more resistent against being restarted

Browse Source
This commit is contained in:
Daniel Gultsch 2016-01-16 21:18:59 +01:00
parent 7b1efe15cd
commit a83365ee95
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,8 +150,7 @@ public class ConversationActivity extends XmppActivity
public boolean isConversationsOverviewHideable() {
if (mContentView instanceof SlidingPaneLayout) {
SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
return mSlidingPaneLayout.isSlideable();
return true;
} else {
return false;
}
@ -1147,6 +1146,7 @@ public class ConversationActivity extends XmppActivity
} else {
if (isConversationsOverviewHideable()) {
openConversation();
updateActionBarTitle(true);
}
}
this.mConversationFragment.reInit(getSelectedConversation());
@ -1327,7 +1327,13 @@ public class ConversationActivity extends XmppActivity
}
} else if (requestCode == REQUEST_TRUST_KEYS_TEXT || requestCode == REQUEST_TRUST_KEYS_MENU) {
this.forbidProcessingPendings = !xmppConnectionServiceBound;
mConversationFragment.onActivityResult(requestCode, resultCode, data);
if (xmppConnectionServiceBound) {
mConversationFragment.onActivityResult(requestCode, resultCode, data);
this.mPostponedActivityResult = null;
} else {
this.mPostponedActivityResult = new Pair<>(requestCode, data);
}
}
} else {
mPendingImageUris.clear();