aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/utils (follow)
Commit message (Collapse)AuthorAgeFilesLines
* avatar displayed as a circle, positioning adjusted, colors changed back to ↵steckbrief2016-05-161-0/+32
| | | | correct ones, positioning moved to own class file
* XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-092-0/+91
| | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil
* Fixes FS#204: Observe all used directoriessteckbrief2016-04-232-0/+44
| | | | | | | - 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
* Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-182-1/+41
|\ | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
| * Implements FS#137: build flavorssteckbrief2016-04-181-1/+1
| | | | | | | | moved Config.java parameters to a flavorable configuration file
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-0/+40
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+48
| | |\ | | |/ | |/| | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
* / | DatabaseBackend updated to serve Conversatiosn Database version and ↵steckbrief2016-04-171-0/+16
|/ / | | | | | | | | | | | | 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)
* | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+47
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-051-0/+36
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-0/+75
| |\ | |/ |/| | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.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/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
* | Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-291-0/+75
| |
* | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-13/+16
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-4/+5
|\|
* | Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
| |
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-0/+2
|\|
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-1/+8
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-82/+0
| |\ | |/ |/|
* | Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-122-87/+10
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-122-3/+31
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+2
| |\ | |/ |/| | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
* | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-111-1/+2
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+4
|\|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+2
|\|
| * use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-072-4/+43
|\|
| * corrected getRealPathFromUrilookshe2016-03-071-2/+40
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0619-177/+662
|\|
| * Packet sending helper moved to XmppSendUtil and methods in ↵steckbrief2016-02-231-0/+8
| | | | | | | | XmppConnectionService marked as deprecated
| * Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)steckbrief2016-02-231-0/+15
| |
| * Imports organizedsteckbrief2016-02-123-5/+0
| |
| * Compilation errors and merge mixups fixedsteckbrief2016-02-111-0/+22
| |
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-132-0/+79
| |\ | |/ |/|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-162-0/+132
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-103-126/+3
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-023-5/+129
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-063-0/+526
| |\ \ \ \
| * | | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0315-2075/+0
| | | | | |
* | | | | | Moved all avatar related work to AvatarServicesteckbrief2016-01-132-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fetchAvatar, fetchAvatarPep, fetchAvatarVcard, checkForAvatar moved from XmppConnectionService to AvatarService - Several unused imports removed - XmppSendUtil introduced to enable presencePacket and iqPacket sending without using XmppConnectionService since the account has everything needed - UiUpdateHelper introduced to enable UI updates without using XmppConnectionService directly
* | | | | | Fixes FS#99: Adjust namespace according to XEP-0363steckbrief2016-01-041-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | Value of namespace constant changed to 'urn:xmpp:http:upload'
* | | | | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-162-0/+132
| | | | | | | | | | | | | | | | | | | | distinguishes between image resizing and compressing/saving
* | | | | Removed stupid DNS query codesteckbrief2015-12-111-150/+71
| |_|_|/ |/| | |
* | | | Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-107-132/+10
| | | |
* | | | Fixed compile error in inner classsteckbrief2015-12-021-1/+1
| |_|/ |/| |
* | | Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-201-1/+1
| | | | | | | | | | | | nce.thedevstack.de
* | | Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-207-17/+141
| |/ |/| | | | | activity to show logcat output and button to copy contents
* | FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-063-0/+523
|/ | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-031-0/+43
| | | | picture or not
* Access to preferences moved to global utility class ↵steckbrief2015-10-211-5/+3
| | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.