conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed null pointer exception in case of IOException before uploading file to ↵	steckbrief	2016-04-16	1	-2/+7
\| \| \| \|	http host
*	Implements FS#176: error logging for httpupload improved	steckbrief	2016-03-28	1	-1/+7
\|
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	1	-5/+1
\|
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	1	-26/+54
\|
*	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵	steckbrief	2015-12-16	1	-1/+2
\| \| \| \|	distinguishes between image resizing and compressing/saving
*	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-1/+1
\|
*	Implements FS#67: Introduce central logging class to use log prefix, new ↵	steckbrief	2015-11-20	1	-4/+4
\| \| \| \|	activity to show logcat output and button to copy contents
*	FileBackend splitted into several util classes for separate concerns: ↵	steckbrief	2015-11-06	1	-4/+5
\| \| \| \|	AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	1	-0/+204
	Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml