aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-1320-240/+325
|\
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-1319-239/+318
| | | | | | | | | | | | | | - 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
| * Publish avatars as PNGsteckbrief2016-01-131-1/+1
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-082-2/+30
|\|
| * Fixes FS#107, Implements FS#77steckbrief2016-01-082-2/+29
| | | | | | | | Show the number of online resources in account view and enable show resources by clicking on the account jid
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-041-1/+1
|\|
| * Fixes FS#99: Adjust namespace according to XEP-0363steckbrief2016-01-041-1/+1
| | | | | | | | Value of namespace constant changed to 'urn:xmpp:http:upload'
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-173-1/+3
|\|
| * Log error in case logcat command could not be executed; Show toast in case ↵steckbrief2015-12-173-1/+3
| | | | | | | | nothing is copied
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-1618-219/+385
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-1617-217/+382
| | | | | | | | distinguishes between image resizing and compressing/saving
| * Fixes FS#95: NPE when opening message details for failed file transfersteckbrief2015-12-161-1/+2
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-113-208/+151
|\|
| * Removed stupid DNS query codesteckbrief2015-12-113-205/+147
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-1036-422/+100
|\|
| * Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-1036-408/+74
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-063-2/+15
|\|
| * Fix flagging no more messages on server for conversationsteckbrief2015-12-063-2/+15
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-044-20/+50
|\|
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-044-20/+50
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-3/+6
|\|
| * Implements FS#89 - Change about informationsteckbrief2015-12-041-3/+6
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0423-124/+124
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-0423-124/+124
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-042-2/+4
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-1/+1
|\|
| * Fixed compile error in inner classsteckbrief2015-12-021-1/+1
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0242-227/+688
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-202-1/+2
| | | | | | | | nce.thedevstack.de
| * Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-2042-226/+686
| | | | | | | | activity to show logcat output and button to copy contents
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0622-579/+786
|\|
| * FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-0622-580/+771
| | | | | | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0320-172/+601
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-0317-173/+549
| | | | | | | | picture or not
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-307-1/+52
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-2311-30/+41
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-2311-30/+39
| | | | | | | | values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-221-1/+2
|\|
| * Implements FS#78: Allow installation on SD cardsteckbrief2015-10-221-1/+2
| |
* | Merge trz/rename into trz/rebasesteckbrief2015-10-2225-351/+536
|\|
| * Access to preferences moved to global utility class ↵steckbrief2015-10-2124-350/+532
| | | | | | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
| * added comment for clarification, why the timestamp of the first msg of msg ↵steckbrief2015-10-171-1/+1
| | | | | | | | list is needed to query older msgs with mam
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-162-1/+4
|\|
| * Fixes FS#82: Background color of conversation list item set to primary ↵steckbrief2015-10-162-1/+4
| | | | | | | | background color
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-153-36/+64
|\|
| * Removed unused importssteckbrief2015-10-151-4/+0
| |
| * Fixes FS#81 - avoid jumps after loading messagessteckbrief2015-10-152-32/+64
| |
* | fix imports and namespacessteckbrief2015-10-052-1/+3
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-057-36/+76
|\| | | | | | | | | | | | | | | Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java
| * Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵steckbrief2015-10-057-36/+76
| | | | | | | | access to app information