| 
							
							
								 iNPUTmice | 05d1f46c15 | recreate activity after theme has changed. fixed #764 | 2014-12-09 20:22:21 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 78370094e9 | cleanup: removed unused emoticon parsing | 2014-12-09 14:21:35 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 490f40b196 | possible work around for some weird - possibly sdk - bugs | 2014-12-07 21:14:13 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | a38005ec89 | fixed #544 | 2014-12-03 12:33:32 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 685f405154 | display proper error in edit account details if jid is invalid | 2014-12-03 10:52:55 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8f62d95e1f | further npe checks | 2014-12-03 10:45:47 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | aaeba697bd | refactored the message adapter a bit | 2014-12-03 10:35:30 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | be358b77d6 | set nick and autojoin=true for new bookmarks | 2014-12-03 10:34:05 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 46b2760069 | worked around concurrent modification exception | 2014-12-03 00:54:07 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9dd445a507 | fixed #728 | 2014-12-01 12:33:57 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8d306ac64f | clear encrypted messages on reinit | 2014-12-01 11:18:55 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 57fd763066 | don't request fragment before updating | 2014-11-30 22:27:11 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | afc673bb15 | Misc. "fixes" to correct warnings. | 2014-11-29 07:50:59 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 7ba41c6a8e | fixed npe. fixed #717 | 2014-11-27 10:30:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2f02d8d398 | create conversation with bare jid | 2014-11-27 10:26:53 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7a75a8bc5a | Merge pull request #713 from betheg/muc MUC: do not add yourself to the muc user list. | 2014-11-24 11:53:28 +01:00 |  | 
			
				
					| 
							
							
								 Michael | 31b539daf7 | MUC: option to set/delete bookmark in conference details. | 2014-11-23 21:37:45 +01:00 |  | 
			
				
					| 
							
							
								 Michael | dbe8280662 | add an listener for the muc roster update. this is for the ConferenceDetailsActivity to show
precence updates immediately. | 2014-11-23 15:19:44 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 36f8a31d7d | Merge pull request #706 from betheg/unused_imports remove unused imports. | 2014-11-21 20:03:46 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 81a1a48b8d | update action bar with conversations updates as well | 2014-11-21 20:02:13 +01:00 |  | 
			
				
					| 
							
							
								 Michael | dc0dba3faf | remove unused imports. | 2014-11-21 19:17:27 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 424de3ea3a | move task to back and not finish when hitting back button | 2014-11-21 18:57:27 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | de0b36fc78 | verify contacts key only on initiating side of smp | 2014-11-21 13:42:25 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 0ad6d0616f | brought ad hoc conferences back. fixed #688 fixed #367 | 2014-11-20 18:20:42 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | cbf42ee12c | some saftey checks before registering listeners in XmppActivity | 2014-11-19 17:31:28 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 10bf2b77a8 | synchronized message list in conversation fragment | 2014-11-18 14:43:15 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | dcebc120ac | show dynamic tags in contacts activity as well | 2014-11-18 14:24:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ab832bcff7 | properly remove conversations context menu | 2014-11-18 13:51:04 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d29c861d03 | disabled broken conversations context menu | 2014-11-18 03:12:51 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 018a0c7978 | better usage of synchronized in some places | 2014-11-18 03:10:59 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 240d2d68c8 | context menu for conversations. fixed #630 | 2014-11-18 00:07:27 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f41c3eee04 | context menu for muc participants + refactor trueCounterpart to use Jid class | 2014-11-17 20:02:46 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 55957a77b3 | Fix linter suppression | 2014-11-17 09:19:11 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 967cd922e1 | highlight muc members by touching their name in muc details. fixed #503 | 2014-11-17 01:54:01 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8c4236b01b | fixed regression of xmpp uris not working | 2014-11-16 22:23:42 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | cf00f3fade | happy hanukkah | 2014-11-16 17:21:21 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ac8c2b7e62 | show full time stamp in connection established field | 2014-11-16 12:11:14 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2067b9bd8d | made scan and show qr code more accessible in VerifyOtrActivity | 2014-11-16 02:10:29 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 88c3537b68 | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible | 2014-11-16 00:20:20 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | d2388a5a7e | Remove extra status wrapper method | 2014-11-15 11:31:15 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 251f4d6d7f | Add incompatible server status | 2014-11-15 11:29:58 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | c09d450db8 | Add security error status | 2014-11-15 11:21:47 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | d94b07c916 | Make account status an enum | 2014-11-15 11:12:41 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 35bf13f5ef | Merge branch 'feature/file_transfer' into development Conflicts:
	src/main/res/values/strings.xml | 2014-11-15 15:52:15 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 07b07115d6 | Merge branch 'feature/foreground_service' into development Conflicts:
	src/main/res/values/strings.xml | 2014-11-15 15:51:27 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 3c6b3506e3 | turn on foreground service in expert settings | 2014-11-15 15:34:34 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 41f7848f2c | handled more error cases | 2014-11-15 15:34:12 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 47d44448f3 | fixed description in notifications and conversation overview | 2014-11-15 15:34:12 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | cc4f3702a8 | made file transfers cancelable | 2014-11-15 15:34:12 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4ab558715c | adepted conversationadapter to deal with files | 2014-11-15 15:34:12 +01:00 |  |