aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/utils (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵steckbrief2015-10-051-13/+2
| | | | access to app information
* Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-041-0/+18
| | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-132/+3
| | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
* resolve of some compiler errors0.0.2lookshe2015-08-131-0/+1
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-117-96/+661
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-0/+15
|
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1913-0/+1618
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed