aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/NotificationService.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Imports organizedsteckbrief2016-02-121-8/+0
|
* Compilation errors and merge mixups fixedsteckbrief2016-02-111-17/+2
|
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-78/+136
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ConferenceDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/values/themes.xml src/main/res/xml/preferences.xml
| * show /me messages in conference notifications without the name of the senderDaniel Gultsch2016-01-131-5/+10
| |
| * show per conference notification settings in details activityDaniel Gultsch2016-01-081-7/+1
| |
| * added missing synchronize when pushing messages from mam backlogDaniel Gultsch2016-01-041-1/+3
| |
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-2/+2
| |
| * notify on mam catchup messagesDaniel Gultsch2015-12-101-2/+2
| |
| * show sender name for notications in conferences. fixes #1581Daniel Gultsch2015-12-091-0/+17
| |
| * hide message content in notifications in paranoia modeDaniel Gultsch2015-12-021-20/+30
| |
| * introduce config.java variable to optionally show number of connected ↵Daniel Gultsch2015-12-011-37/+55
| | | | | | | | accounts in notification
| * Decrypt PGP messages in backgroundfiaxh2015-10-281-1/+1
| |
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-15/+27
| |
| * introduced expert options to set status to away and xa if screen is off or ↵Daniel Gultsch2015-10-081-17/+1
| | | | | | | | if phone is silenced
| * swapped icons for foreground servicesDaniel Gultsch2015-09-221-3/+1
| |
| * use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-261-1/+1
| |
| * show http downloaded images in notificationDaniel Gultsch2015-07-291-2/+3
| |
| * treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-221-1/+1
| |
| * renamed colorsDaniel Gultsch2015-07-131-1/+1
| |
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-5/+3
| |
| * added ShortcutBadger as a dependency to create unread counts on launcher iconDaniel Gultsch2015-05-201-0/+1
| |
| * only forward incoming chat messages to Pebble App and GadgetbridgeAndreas Shimokawa2015-05-081-1/+5
| |
| * made material icons smaller (24dp)Daniel Gultsch2015-04-281-2/+2
| |
| * escape nick in highlight regex patternDaniel Gultsch2015-04-281-1/+1
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-091-1/+1
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-091-6/+7
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-2/+1
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-1/+1
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-061-2/+2
|\| |
* | | Merge trz/rename into trz/rebasesteckbrief2015-10-221-22/+10
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-559/+0
| | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | | fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conferencelookshe2015-08-161-1/+1
| | |
* | | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-10/+13
|/ /
* | Color choose dialogsteckbrief2015-04-111-10/+2
| |
* | correct parsing of led colorlookshe2015-04-111-1/+1
| |
* | Configurable LED color (Attention: Expert setting because currently only ↵steckbrief2015-03-311-1/+10
|/ | | | text input)
* Merge pull request #1036 from QuentinC/developmentDaniel Gultsch2015-03-181-1/+1
|\ | | | | Green led color is better with "full-green"
| * Green led color is better with "full-green"Quentin2015-03-041-1/+1
| |
* | open location directly from notificationiNPUTmice2015-03-101-0/+25
|/
* use conversations green in notification lediNPUTmice2015-02-271-1/+1
|
* Update NotificationService.javaQuentinC2015-02-271-1/+1
| | | Revert led light color
* - Update mBuilder in NotificationService.java to ensure that the led is ↵Quentin2015-02-271-1/+2
| | | | | | | displayed at the right color. CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793 - Changed led Color to green to remember the icon color and led times
* get rid of some useless debuggingiNPUTmice2015-02-231-3/+0
|
* added actions to error notificationiNPUTmice2015-02-101-1/+23
|
* Use Material Design Icons on API 21+Sam Whited2015-01-291-6/+17
|
* Add color / category to foreground notificationSam Whited2015-01-201-7/+14
|
* fixed legacy translation of image receivediNPUTmice2015-01-191-1/+3
|
* Add some Android 21 notification featuresSam Whited2015-01-171-0/+4
|
* Correct the download file string on notificationsSam Whited2015-01-171-5/+2
| | | | Fixes #896
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 06:50:20 +0000