conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Fixes FS#230: Uncaught NullPointerException in DNSHelper	steckbrief	2016-08-26	1	-7/+12
\| \| \| \| \|
* \| \| \| \|	Fixes conditions for cplus db upgrades	steckbrief	2016-08-23	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Javadoc added and access to xmppConnectionService moved	steckbrief	2016-08-23	2	-5/+14
\| \| \| \| \|
* \| \| \| \|	Fixes FS#229: prompt for confirmation before deleting a file	steckbrief	2016-08-23	4	-9/+41
\| \| \| \| \|
* \| \| \| \|	Confirmation dialog added before sending delete command for remote file	steckbrief	2016-08-23	6	-23/+84
\| \| \| \| \|
* \| \| \| \|	services.filetransfer.httpupload moved to new namespace ↵	steckbrief	2016-08-23	11	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	services.filetransfer.http.upload; delete parts of services.filetransfer.http moved to .delete package
* \| \| \| \|	xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete ↵	steckbrief	2016-08-23	15	-28/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	parts of xmpp.filetransfer.http moved to .delete package
* \| \| \| \|	Improved error handling for httpupload	steckbrief	2016-08-22	1	-4/+7
\| \| \| \| \|
* \| \| \| \|	Basic filetransfer http delete implementation; Exceptions for IqPacketError ↵	steckbrief	2016-08-22	22	-15/+547
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added
* \| \| \| \|	Merge remote-tracking branch 'remotes/origin/filetransfer'	steckbrief	2016-08-22	46	-205/+1679
\|\ \ \ \ \
\| * \| \| \| \|	Related to FS#131, FS#129, FS#220:filetransfer	steckbrief	2016-06-06	14	-83/+472
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- FileTransferFailureReason including types introduced. A failure can be recoverable, non-recoverable or limited recoverable - in case file transfer with the highest weight factor fails, the next file transfer method is used - improved logging - javadoc comments added
\| * \| \| \| \|	FileTransfer reworked (first steps - functionality as is), HttpUpload	steckbrief	2016-05-29	39	-199/+1165
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	separated, some bugfixes - HttpUpload moved into own package - FileTransfer managed by a central manager class, several FileTransferService implementation can be used - Security initializations moved to ConversationsPlusApplication - Access to PowerManager moved to ConversationsPlusApplication - Removed unused code fragments - Access to HttpConnectionManager is now static
\| * \| \| \| \|	Fixed javadoc of HttpUploadHint	steckbrief	2016-05-26	1	-1/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed javadoc of PubSub Element Generation/Parsing	steckbrief	2016-05-26	3	-5/+114
\| \| \|_\|_\|/ \| \|/\| \| \|
* / \| \| \|	Implements FS#227: Store password encrypted in internal database	steckbrief	2016-07-16	4	-3/+267
\|/ / / /
* \| \| /	XmppConnectionService.markMessage moved to MessageUtil	steckbrief	2016-05-09	13	-108/+132
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	XmppConnectionService.attachLocationToConversation moved to ConversationUtil
* \| \|	Fixes FS#204: Observe all used directories	steckbrief	2016-04-23	8	-48/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Implementing the FileObserver in a separate class, with mask to watch only deletions not everything - Add observation of all directories which could contain a sent/received file - Change observers if the folder names are changed via settings - markMessage method moved from XmppConnectionService to MessageUtil
* \| \|	Related to FS#134: check if oldversion is smaller then new version on ↵	steckbrief	2016-04-23	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|	upgrading c+ db
* \| \|	Removed download decision MUST if the message contains jabber:x:oob:oob/urlintroduce_cplus_database_version	steckbrief	2016-04-19	1	-3/+0
\| \| \|
* \| \|	Persist Message.treatAsDownloadable	steckbrief	2016-04-19	2	-2/+15
\| \| \|
* \| \|	Related to FS#134: Set Message flags according to httpupload hint	steckbrief	2016-04-19	3	-0/+9
\| \| \|
* \| \|	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	64	-305/+554
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
\| * \|	Implements FS#137: build flavors	steckbrief	2016-04-18	2	-50/+37
\| \| \| \| \| \| \| \| \| \| \| \|	moved Config.java parameters to a flavorable configuration file
\| * \|	Related to FS#199: fixed merge hickups (message correction setting removed, ↵	steckbrief	2016-04-18	2	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \|	key for other expert settings readded)
\| * \|	Related to FS#199: Removed unnecessary build configuration variable to hide ↵	steckbrief	2016-04-18	2	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \|	disable button on foreground service notification
\| * \|	Related to FS#199: Removed unnecessary differentiation between a ↵	steckbrief	2016-04-18	3	-16/+1
\| \| \| \| \| \| \| \| \| \| \| \|	conversation with the own account
\| * \|	removed unused string	lookshe	2016-04-17	1	-1/+0
\| \| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	64	-250/+538
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
\| \| *	@Overrides added	lookshe	2016-04-17	1	-0/+6
\| \| \|
\| \| *	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	64	-285/+538
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
\| \| \| *	always notify by default in conferences	Daniel Gultsch	2016-04-14	2	-3/+1
\| \| \| \|
\| \| \| *	removed unnecessary call to stopSelf() after logging out	Daniel Gultsch	2016-04-14	1	-5/+11
\| \| \| \|
\| \| \| *	add setting for quick sharing	Daniel Gultsch	2016-04-14	3	-17/+51
\| \| \| \|
\| \| \| *	removed unused call to cancel events	Daniel Gultsch	2016-04-14	1	-1/+0
\| \| \| \|
\| \| \| *	create Config varibale to show the disable foreground service button	Daniel Gultsch	2016-04-13	2	-3/+6
\| \| \| \|
\| \| \| *	hacky workaround to determine if uri points to private file on < lolipop	Daniel Gultsch	2016-04-13	3	-9/+25
\| \| \| \|
\| \| \| *	return own jid as true counterpart on self messages in muc	Daniel Gultsch	2016-04-13	1	-0/+3
\| \| \| \|
\| \| \| *	added share uri button to conference details	Daniel Gultsch	2016-04-12	15	-14/+43
\| \| \| \|
\| \| \| *	reverse order in contact chooser	Daniel Gultsch	2016-04-12	1	-1/+1
\| \| \| \|
\| \| \| *	minor code cleanup	Daniel Gultsch	2016-04-12	1	-3/+1
\| \| \| \|
\| \| \| *	republish avatar if server offers non-persistent pep :-(	Daniel Gultsch	2016-04-11	4	-37/+144
\| \| \| \|
\| \| \| *	pulled translations from transifex	Daniel Gultsch	2016-04-10	29	-86/+27
\| \| \| \|
\| \| \| *	don't throw IO exception at end of stream	Daniel Gultsch	2016-04-10	1	-1/+0
\| \| \| \|
\| \| \| *	fixed 'connecting…' button	Daniel Gultsch	2016-04-10	1	-3/+6
\| \| \| \|
\| \| \| *	moved authentication into seperate method. force close socket before ↵	Daniel Gultsch	2016-04-10	1	-38/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changing status
\| \| \| *	introduced setting to turn of notification led	Daniel Gultsch	2016-04-09	3	-5/+15
\| \| \| \|
\| \| \| *	use startdate as lower bound when querying archive with after=x	Daniel Gultsch	2016-04-09	1	-13/+3
\| \| \| \|
\| \| \| *	don't show contact details when in conversations with self	Daniel Gultsch	2016-04-09	3	-1/+8
\| \| \| \|
\| \| \| *	use last received message id when querying archive	Daniel Gultsch	2016-04-09	1	-7/+17
\| \| \| \|
\| \| \| *	transform nimbuzz workaround into a more general 'waitForDisco' condition	Daniel Gultsch	2016-04-09	1	-6/+11
\| \| \| \|