aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/UIHelper.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Added columns to fileparams table: url, original file name, key and ivtrz/beta-5steckbrief2017-01-041-5/+29
| | | | | auto download of files moved from MessageParser to MessageAdapter download and open file representation cleaned up
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-13/+17
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
* \ FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-4/+5
|\ \
| * | show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
|\ \ \ | | |/ | |/|
* | | Added method to get body from message if hasMeCommand and harmonized ↵lookshe2016-03-121-4/+2
| | | | | | | | | | | | extraction of fileextension (FS#38)
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-1/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-041-1/+4
| | |
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml
| * | Retry decryption from message menufiaxh2016-02-231-1/+3
| | |
* | | Fixes FS#48 and FS#136trz/merge_1.10.0lookshe2016-02-281-6/+0
| | | | | | | | | | | | | | | - corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage
* | | Changed access to presences according to new Presence representation in Csteckbrief2016-02-231-6/+7
| | |
* | | Imports organizedsteckbrief2016-02-121-19/+1
| | |
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | handle null names in getColorForNameDaniel Gultsch2015-12-291-1/+1
| | |
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-21/+0
| | |
| * | Reset the margins manually after rotatingsaqura2015-10-261-0/+21
| | |
| * | Optimize importsAndreas Straub2015-07-201-6/+6
| | |
| * | made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-1/+2
| | |
| * | renamed downloadable to transferableDaniel Gultsch2015-07-101-10/+9
| | |
| * | show contacts name in non anonymous mucs. fixes #1213Daniel Gultsch2015-07-051-2/+6
| | |
| * | changed mime type handlingDaniel Gultsch2015-07-011-10/+1
| | |
| * | added a few location questionsDaniel Gultsch2015-05-141-3/+8
| | |
| * | ignore question marks in location questionDaniel Gultsch2015-05-131-10/+13
| | |
| * | show location quick action after receiving a question about the users locationDaniel Gultsch2015-05-131-0/+24
| | |
| * | optimized heart render code a bitDaniel Gultsch2015-05-101-3/+7
| | |
| * | added white heart to new rendering as wellDaniel Gultsch2015-05-101-0/+1
| | |
| * | paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-101-0/+4
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-0/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-369/+0
| | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-161-129/+0
| | |
* | | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-3/+3
| | | | | | | | | | | | Fixes FS#34 - review all calls for String.trim()
* | | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-22/+58
| | |
* | | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-0/+14
|/ /
* | no trim of messages or passwordlookshe2015-04-111-2/+1
| | | | | | | | check password with only spaces separately
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-2/+8
|\| | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-1/+7
| |
| * trim message bodys on displayDaniel Gultsch2015-02-071-1/+1
| |
* | Merge master-originsteckbrief2015-02-201-8/+133
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
| * fixed text preview for imagesiNPUTmice2015-02-011-1/+1
| |
| * fix mergable() for /me command.Michael2015-01-251-2/+3
| |
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+8
| |
| * use same helper methods for images and filesiNPUTmice2015-01-181-21/+8
| |
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+4
| |\ | | | | | | Added new file type names for file transfers
| | * Added new file type names for file transfersChristian S2015-01-181-0/+4
| | | | | | | | | | | | | | | - apk - vcard
| * | Fix string substitutions with unknown filetypesSam Whited2015-01-171-2/+2
| |/
| * Correct the download file string on notificationsSam Whited2015-01-171-10/+12
| | | | | | | | Fixes #896
| * handle muc nicks with white spaces. fixed #884iNPUTmice2015-01-141-2/+2
| |
| * catch bug in guessContentTypeDaniel Gultsch2015-01-121-1/+6
| |
| * reworked message preview / message meta information (ie file offered, ↵Daniel Gultsch2015-01-121-0/+110
| | | | | | | | | | | | received * file) fixed #837