aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge trz/rename into trz/rebasesteckbrief2015-10-223-7/+300
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix imports and namespacessteckbrief2015-10-051-0/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-0/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | fixed importslookshe2015-10-054-10/+10
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-054-0/+418
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
* | | | | | | | | | | | | | | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵steckbrief2016-02-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should be shown for a message
* | | | | | | | | | | | | | | | implementation hint for FS#96 addedsteckbrief2016-02-091-0/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵steckbrief2016-02-091-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should be shown for a message
* | | | | | | | | | | | | | | | Fixed minor class cast issuesteckbrief2016-01-161-4/+4
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Introducing some specialized IqPacketGeneratorssteckbrief2016-01-1510-87/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - IqPacketGenerator - PubSubPacketGenerator - AvatarPacketGenerator
* | | | | | | | | | | | | | | Moved all avatar related work to AvatarServicesteckbrief2016-01-154-65/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - publishAvatar moved from XmppConnectionService to AvatarService
* | | | | | | | | | | | | | | Implements FS#111: Compress resized picture with PNG formatsteckbrief2016-01-151-3/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-151-2/+12
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixes FS#107, Implements FS#77steckbrief2016-01-081-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show the number of online resources in account view and enable show resources by clicking on the account jid
* | | | | | | | | | | | | | Fixes FS#99: Adjust namespace according to XEP-0363steckbrief2016-01-041-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Value of namespace constant changed to 'urn:xmpp:http:upload'
* | | | | | | | | | | | | Log error in case logcat command could not be executed; Show toast in case ↵steckbrief2015-12-171-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nothing is copied
* | | | | | | | | | | | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-1614-198/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | distinguishes between image resizing and compressing/saving
* | | | | | | | | | | | Fixes FS#95: NPE when opening message details for failed file transfersteckbrief2015-12-161-1/+2
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Removed stupid DNS query codesteckbrief2015-12-113-205/+147
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-1035-407/+73
| | | | | | | | | |
* | | | | | | | | | Fix flagging no more messages on server for conversationsteckbrief2015-12-063-2/+15
| | | | | | | | | |
* | | | | | | | | | Implements FS#83: Reload from last received messagesteckbrief2015-12-043-16/+44
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-043-16/+9
| | | | | | | | |
* | | | | | | | | 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-2036-226/+639
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | activity to show logcat output and button to copy contents
* | | | | | | FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-0622-580/+771
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* | | | | | Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-0314-173/+521
| | | | | | | | | | | | | | | | | | | | | | | | picture or not
* | | | | | Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-303-0/+24
| |_|_|_|/ |/| | | |
* | | | | Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-239-27/+36
| |_|_|/ |/| | | | | | | | | | | 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-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
* | | | Removed unused importssteckbrief2015-10-151-4/+0
| | | |
* | | | Fixes FS#81 - avoid jumps after loading messagessteckbrief2015-10-152-32/+64
| |_|/ |/| |
* | | Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵steckbrief2015-10-056-35/+74
| |/ |/| | | | | access to app information
* | Publishing additional information in message details dialog such as message ↵steckbrief2015-10-041-18/+142
| | | | | | | | type and message status
* | Note added where to change sth. for FS#70steckbrief2015-10-041-1/+2
| |
* | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-048-3/+321
| | | | | | | | | | | | | | 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
* | Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-022-6/+9
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-211-3/+3
|\|
* | moved merged files to correct location0.0.3lookshe2015-08-163-0/+167
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1614-409/+222
|\| | | | | | | | | | | 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-133-1/+3
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1161-2115/+3783
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preferencesteckbrief2015-06-191-2/+5
| |
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-195-0/+34
| |
* | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-19126-0/+26180
|/ | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-141-1/+19
| | | | settings class
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 13:07:29 +0000