Commit graph

3636 commits

Author SHA1 Message Date
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
10e607ac51 XmppConnectionService.markMessage moved to MessageUtil
XmppConnectionService.attachLocationToConversation moved to ConversationUtil
2016-05-09 20:41:58 +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
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
Daniel Gultsch
72aa10b536 add setting for quick sharing 2016-04-14 21:12:44 +02:00
Daniel Gultsch
39e717ed94 removed unused call to cancel events 2016-04-14 00:16:59 +02:00
Daniel Gultsch
c53c6cb6b6 create Config varibale to show the disable foreground service button 2016-04-13 18:00:12 +02:00
Daniel Gultsch
594e65bb2b hacky workaround to determine if uri points to private file on < lolipop 2016-04-13 11:14:36 +02:00
Daniel Gultsch
4332b0df44 return own jid as true counterpart on self messages in muc 2016-04-13 11:13:47 +02:00
Daniel Gultsch
3e654bea0e added share uri button to conference details 2016-04-12 18:30:02 +02:00
Daniel Gultsch
2a4db01709 reverse order in contact chooser 2016-04-12 18:29:41 +02:00
Daniel Gultsch
7223b5b274 minor code cleanup 2016-04-12 17:52:58 +02:00
Daniel Gultsch
7ff890e513 republish avatar if server offers non-persistent pep :-( 2016-04-11 22:20:32 +02:00
Daniel Gultsch
23a0beab43 version bump to 1.11.6 + changelog 2016-04-10 21:20:13 +02:00
Daniel Gultsch
77f4513862 pulled translations from transifex 2016-04-10 21:19:50 +02:00
Daniel Gultsch
677269606c add entries to gitignore 2016-04-10 00:31:25 +02:00
Daniel Gultsch
5786e75374 don't throw IO exception at end of stream 2016-04-10 00:19:53 +02:00
Daniel Gultsch
91b17c6925 fixed 'connecting…' button 2016-04-10 00:19:20 +02:00
Daniel Gultsch
607b7d1593 moved authentication into seperate method. force close socket before changing status 2016-04-10 00:18:14 +02:00
Daniel Gultsch
83fab06508 introduced setting to turn of notification led 2016-04-09 21:48:06 +02:00
Daniel Gultsch
4652541b61 update gradle and gradle plugin 2016-04-09 21:47:10 +02:00
Daniel Gultsch
65548ddccb use startdate as lower bound when querying archive with after=x 2016-04-09 12:31:08 +02:00
Daniel Gultsch
b99d70bfe7 don't show contact details when in conversations with self 2016-04-09 10:59:54 +02:00
Daniel Gultsch
2713fd50c8 use last received message id when querying archive 2016-04-09 10:29:34 +02:00
Daniel Gultsch
14b46c3ee7 transform nimbuzz workaround into a more general 'waitForDisco' condition 2016-04-09 08:53:58 +02:00
Daniel Gultsch
a8ebc5fafc add required disco#items query to timeout list 2016-04-08 20:20:37 +02:00
Daniel Gultsch
c22b384680 increase version code to fix nasty bug in 1.11.5 beta 2016-04-08 18:29:32 +02:00
Daniel Gultsch
db0301310b removed ernoexception in exchange for a regular exeption to prevent verify error on <5.0 2016-04-08 18:28:40 +02:00
Daniel Gultsch
7a84cfdfa2 version bump to 1.11.5 + changelog 2016-04-08 10:41:55 +02:00