Commit graph

3661 commits

Author SHA1 Message Date
steckbrief
ca1cae4fac Version set to beta-6 2017-01-04 21:43:25 +01:00
steckbrief
955797a090 Fixed NPE in FileParams.setKeyAndIv 2017-01-04 21:42:16 +01:00
steckbrief
95cb239415 Added columns to fileparams table: url, original file name, key and iv
auto download of files moved from MessageParser to MessageAdapter
download and open file representation cleaned up
2017-01-04 19:41:20 +01:00
steckbrief
b85035c2bf Adjusted maven URL 2017-01-02 15:52:00 +01:00
steckbrief
6bfda82067 versioncode and versionname updated in build.gradle 2016-11-11 16:02:33 +01:00
steckbrief
59e861ee69 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-10-20 19:45:26 +02:00
steckbrief
9ec29bb1dc Fixes FS#29: Own Avatar not loaded 2016-09-29 11:58:17 +02:00
steckbrief
34fcdda53f Implements FS#235: Deletion of remote files uploaded via httpupload 2016-09-29 11:57:16 +02:00
steckbrief
297bed106e Fixes FS#230: Uncaught NullPointerException in DNSHelper 2016-08-26 10:52:07 +02:00
steckbrief
0ef9af997c Fixes conditions for cplus db upgrades 2016-08-23 12:17:58 +02:00
steckbrief
c6ed89e410 Javadoc added and access to xmppConnectionService moved 2016-08-23 12:00:50 +02:00
steckbrief
14e28d1e9a Fixes FS#229: prompt for confirmation before deleting a file 2016-08-23 11:34:14 +02:00
steckbrief
ad096f4bfd Confirmation dialog added before sending delete command for remote file 2016-08-23 11:23:40 +02:00
steckbrief
e91e8a30b1 services.filetransfer.httpupload moved to new namespace services.filetransfer.http.upload; delete parts of services.filetransfer.http moved to .delete package 2016-08-23 09:49:06 +02:00
steckbrief
2d462a746e xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete parts of xmpp.filetransfer.http moved to .delete package 2016-08-23 09:46:51 +02:00
steckbrief
e7089c55ac Improved error handling for httpupload 2016-08-22 21:30:57 +02:00
steckbrief
3ed7cb54e5 Basic filetransfer http delete implementation; Exceptions for IqPacketError added 2016-08-22 21:30:36 +02:00
steckbrief
77d0c1110a Merge remote-tracking branch 'remotes/origin/filetransfer' 2016-08-22 08:55:37 +02:00
steckbrief
97100834a5 Implements FS#227: Store password encrypted in internal database 2016-07-16 15:11:36 +02:00
steckbrief
f45ad10b1b Related to FS#131, FS#129, FS#220:
- 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
2016-06-06 09:07:59 +02:00
steckbrief
b1ab7347b9 FileTransfer reworked (first steps - functionality as is), HttpUpload
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
2016-05-29 20:33:36 +02:00
steckbrief
d3a2fe5796 Fixed javadoc of HttpUploadHint 2016-05-26 20:36:14 +02:00
steckbrief
56b5eae480 Fixed javadoc of PubSub Element Generation/Parsing 2016-05-26 20:34:05 +02:00
steckbrief
2860088f0e Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-05-09 21:10:11 +02:00
steckbrief
10e607ac51 XmppConnectionService.markMessage moved to MessageUtil
XmppConnectionService.attachLocationToConversation moved to ConversationUtil
2016-05-09 20:41:58 +02:00
steckbrief
be448291ca version name set to beta-3 2016-05-02 11:15:46 +02:00
steckbrief
b5abdd1b6d Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
2016-04-23 23:22:57 +02:00
steckbrief
b789ace386 Fixes FS#204: Observe all used directories
- 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
2016-04-23 22:50:54 +02:00
steckbrief
ab82801448 Related to FS#134: check if oldversion is smaller then new version on upgrading c+ db 2016-04-23 22:45:22 +02:00
steckbrief
16e8de1085 Removed download decision MUST if the message contains jabberoob:oob/url 2016-04-19 21:53:23 +02:00
steckbrief
6bd26c987a Persist Message.treatAsDownloadable 2016-04-19 20:14:35 +02:00
steckbrief
4db32cdc8f Related to FS#134: Set Message flags according to httpupload hint 2016-04-19 20:14:04 +02:00
steckbrief
ee0264d98c Merge branch 'master' into introduce_cplus_database_version
Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	src/main/res/values/strings.xml
2016-04-18 19:58:40 +02:00
steckbrief
52fec558ad Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-04-18 19:27:01 +02:00
steckbrief
61149411c5 Merge commit 'remotes/origin/trz/rename~4' into trz/rebase 2016-04-18 19:26:45 +02:00
steckbrief
7df96caedb Implements FS#137: build flavors
moved Config.java parameters to a flavorable configuration file
2016-04-18 16:51:50 +02:00
steckbrief
2e063d8696 Related to FS#199: fixed merge hickups (message correction setting removed, key for other expert settings readded) 2016-04-18 15:07:15 +02:00
steckbrief
073813d192 Related to FS#199: Removed unnecessary build configuration variable to hide disable button on foreground service notification 2016-04-18 09:38:55 +02:00
steckbrief
22394cfaf0 Related to FS#199: Removed unnecessary differentiation between a conversation with the own account 2016-04-18 09:11:58 +02:00
steckbrief
d94eb9309b DatabaseBackend updated to serve Conversatiosn Database version and Conversations+ Database version
HttpUpload Flag introduced for message to identify if a link was sent after httpupload
message hint for httpupload added (message parsing and message generating)
2016-04-17 21:08:14 +02:00
9b59faa2fa removed unused string 2016-04-17 19:01:32 +02:00
ad6208e530 Merge branch 'trz/rebase' into trz/rename
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
2016-04-17 17:37:43 +02:00
1f81683d26 Merge branch 'trz/rebase' (early part) into trz/rename 2016-04-17 17:10:21 +02:00
de7631e300 @Overrides added 2016-04-17 17:02:50 +02:00
4b11fa4c69 Merge tag '1.11.7' into trz/merge_1.11.7
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
2016-04-17 16:54:19 +02:00
steckbrief
2fdd4e6518 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-04-16 21:43:01 +02:00
steckbrief
c854f659db Fixed null pointer exception in case of IOException before uploading file to http host 2016-04-16 21:37:19 +02:00
Daniel Gultsch
bfe01c4322 version bump to 1.11.7 + changelog 2016-04-14 23:13:44 +02:00
Daniel Gultsch
e9494af098 always notify by default in conferences 2016-04-14 22:37:05 +02:00
Daniel Gultsch
eb63cdb9ad removed unnecessary call to stopSelf() after logging out 2016-04-14 21:45:36 +02:00