aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/xmpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-59/+84
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-061-1/+2
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-053-13/+43
|\|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-252-6/+8
|\|
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-2/+2
|\|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-121-33/+29
|\|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-4/+4
|\|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-071-1/+2
|\|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0622-559/+1032
|\|
| * Imports organizedsteckbrief2016-02-122-2/+0
| |
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-1546-4122/+20
| | | | | | | | Cast problem fixed
* | Fixed minor class cast issuesteckbrief2016-01-161-4/+4
|/
* Introducing some specialized IqPacketGeneratorssteckbrief2016-01-156-0/+276
| | | | | | - IqPacketGenerator - PubSubPacketGenerator - AvatarPacketGenerator
* Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-161-1/+2
| | | | distinguishes between image resizing and compressing/saving
* Removed stupid DNS query codesteckbrief2015-12-111-55/+23
|
* Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-105-6/+7
|
* Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-205-97/+97
| | | | activity to show logcat output and button to copy contents
* FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-063-9/+10
| | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-231-3/+3
| | | | values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* Access to preferences moved to global utility class ↵steckbrief2015-10-211-11/+0
| | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-119-226/+399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1940-0/+3973
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed