fixed regression introduced in previous commit.
This commit is contained in:
		
							parent
							
								
									143ad48be1
								
							
						
					
					
						commit
						59f82cbd34
					
				| @ -304,18 +304,19 @@ public class ConversationActivity extends XmppActivity | |||||||
| 
 | 
 | ||||||
| 				@Override | 				@Override | ||||||
| 				public void onPanelOpened(View arg0) { | 				public void onPanelOpened(View arg0) { | ||||||
|  | 					mShouldPanelBeOpen.set(true); | ||||||
| 					updateActionBarTitle(); | 					updateActionBarTitle(); | ||||||
| 					invalidateOptionsMenu(); | 					invalidateOptionsMenu(); | ||||||
| 					hideKeyboard(); | 					hideKeyboard(); | ||||||
| 					if (xmppConnectionServiceBound) { | 					if (xmppConnectionServiceBound) { | ||||||
| 						xmppConnectionService.getNotificationService() | 						xmppConnectionService.getNotificationService().setOpenConversation(null); | ||||||
| 								.setOpenConversation(null); |  | ||||||
| 					} | 					} | ||||||
| 					closeContextMenu(); | 					closeContextMenu(); | ||||||
| 				} | 				} | ||||||
| 
 | 
 | ||||||
| 				@Override | 				@Override | ||||||
| 				public void onPanelClosed(View arg0) { | 				public void onPanelClosed(View arg0) { | ||||||
|  | 					mShouldPanelBeOpen.set(false); | ||||||
| 					listView.discardUndo(); | 					listView.discardUndo(); | ||||||
| 					openConversation(); | 					openConversation(); | ||||||
| 				} | 				} | ||||||
| @ -1131,7 +1132,6 @@ public class ConversationActivity extends XmppActivity | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 		if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) { | 		if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) { | ||||||
| 			Conversation c = getSelectedConversation(); |  | ||||||
| 			sendReadMarkerIfNecessary(getSelectedConversation()); | 			sendReadMarkerIfNecessary(getSelectedConversation()); | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| @ -1269,6 +1269,9 @@ public class ConversationActivity extends XmppActivity | |||||||
| 		if (!ExceptionHelper.checkForCrash(this, this.xmppConnectionService)) { | 		if (!ExceptionHelper.checkForCrash(this, this.xmppConnectionService)) { | ||||||
| 			openBatteryOptimizationDialogIfNeeded(); | 			openBatteryOptimizationDialogIfNeeded(); | ||||||
| 		} | 		} | ||||||
|  | 		if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) { | ||||||
|  | 			xmppConnectionService.getNotificationService().setOpenConversation(null); | ||||||
|  | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	private void handleViewConversationIntent(final Intent intent) { | 	private void handleViewConversationIntent(final Intent intent) { | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Daniel Gultsch
						Daniel Gultsch