removed some dead code
This commit is contained in:
		
							parent
							
								
									d2c9bf31cd
								
							
						
					
					
						commit
						127b7866f0
					
				| @ -718,21 +718,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa | ||||
| 			final ConversationActivity activity = (ConversationActivity) getActivity(); | ||||
| 			if (this.conversation != null) { | ||||
| 				updateSnackBar(this.conversation); | ||||
| 				final Contact contact = this.conversation.getContact(); | ||||
| 				if (this.conversation.isBlocked()) { | ||||
| 
 | ||||
| 				} else if (!contact.showInRoster() | ||||
| 						&& contact | ||||
| 						.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) { | ||||
| 
 | ||||
| 				} else if (conversation.getMode() == Conversation.MODE_SINGLE) { | ||||
| 					makeFingerprintWarning(); | ||||
| 				} else if (!conversation.getMucOptions().online() | ||||
| 						&& conversation.getAccount().getStatus() == Account.State.ONLINE) { | ||||
| 
 | ||||
| 				} else if (this.conversation.isMuted()) { | ||||
| 
 | ||||
| 				} | ||||
| 				conversation.populateWithMessages(ConversationFragment.this.messageList); | ||||
| 				for (final Message message : this.messageList) { | ||||
| 					if (message.getEncryption() == Message.ENCRYPTION_PGP | ||||
| @ -878,10 +863,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	protected void makeFingerprintWarning() { | ||||
| 
 | ||||
| 	} | ||||
| 
 | ||||
| 	protected void showSnackbar(final int message, final int action, | ||||
| 			final OnClickListener clickListener) { | ||||
| 		snackbar.setVisibility(View.VISIBLE); | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Daniel Gultsch
						Daniel Gultsch