From d783cec97084a12873ca62b5fcd64620056ec01b Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sat, 19 Nov 2016 23:07:54 +0100 Subject: reformat code --- art/conversations_baloon.svg | 624 +- art/conversations_mono.svg | 442 +- art/conversations_mono_dashed.svg | 548 +- art/ic_read_indicator.svg | 75 +- art/ic_received_indicator.svg | 4 +- art/ic_send_cancel_away.svg | 65 +- art/ic_send_cancel_dnd.svg | 65 +- art/ic_send_cancel_offline.svg | 65 +- art/ic_send_cancel_online.svg | 65 +- art/ic_send_location_away.svg | 65 +- art/ic_send_location_dnd.svg | 65 +- art/ic_send_location_offline.svg | 65 +- art/ic_send_location_online.svg | 65 +- art/ic_send_photo_away.svg | 72 +- art/ic_send_photo_dnd.svg | 72 +- art/ic_send_photo_offline.svg | 72 +- art/ic_send_photo_online.svg | 72 +- art/ic_send_picture_away.svg | 67 +- art/ic_send_picture_dnd.svg | 67 +- art/ic_send_picture_offline.svg | 67 +- art/ic_send_picture_online.svg | 67 +- art/ic_send_text_away.svg | 79 +- art/ic_send_text_dnd.svg | 79 +- art/ic_send_text_offline.svg | 82 +- art/ic_send_text_online.svg | 79 +- art/ic_send_video_away.svg | 72 +- art/ic_send_video_dnd.svg | 72 +- art/ic_send_video_offline.svg | 72 +- art/ic_send_video_online.svg | 72 +- art/ic_send_voice_away.svg | 65 +- art/ic_send_voice_dnd.svg | 65 +- art/ic_send_voice_offline.svg | 65 +- art/ic_send_voice_online.svg | 65 +- art/ic_verified_fingerprint.svg | 65 +- art/md_switch_thumb_disable.svg | 205 +- art/md_switch_thumb_off_normal.svg | 198 +- art/md_switch_thumb_off_pressed.svg | 207 +- art/md_switch_thumb_on_normal.svg | 189 +- art/md_switch_thumb_on_pressed.svg | 212 +- art/message_bubble_received.svg | 205 +- art/message_bubble_received_warning.svg | 205 +- art/message_bubble_received_white.svg | 205 +- art/message_bubble_sent.svg | 205 +- art/message_bubble_sent_white.svg | 205 +- art/omemo_logo.svg | 420 +- art/play_video.svg | 73 +- libs/MemorizingTrustManager/AndroidManifest.xml | 15 +- libs/MemorizingTrustManager/ant.properties | 3 - libs/MemorizingTrustManager/build.gradle | 46 +- libs/MemorizingTrustManager/build.xml | 5 +- .../example/AndroidManifest.xml | 21 +- libs/MemorizingTrustManager/example/ant.properties | 4 - libs/MemorizingTrustManager/example/build.gradle | 28 +- libs/MemorizingTrustManager/example/build.xml | 5 +- .../example/project.properties | 1 - .../example/res/layout/mtmexample.xml | 64 +- .../src/de/duenndns/mtmexample/JULHandler.java | 258 +- .../src/de/duenndns/mtmexample/MTMExample.java | 232 +- libs/MemorizingTrustManager/project.properties | 1 - .../src/de/duenndns/ssl/MTMDecision.java | 10 +- .../src/de/duenndns/ssl/MemorizingActivity.java | 114 +- .../de/duenndns/ssl/MemorizingTrustManager.java | 1325 ++-- libs/audiowife/build.gradle | 8 +- libs/audiowife/src/main/AndroidManifest.xml | 3 +- .../main/java/nl/changer/audiowife/AudioWife.java | 1 + .../main/res/drawable/gray_border_wo_padding.xml | 5 +- libs/audiowife/src/main/res/layout/aw_player.xml | 2 +- libs/emojicon/AndroidManifest.xml | 7 +- libs/emojicon/lint.xml | 3 +- libs/emojicon/project.properties | 1 - .../res/drawable/ic_emoji_nature_light.xml | 18 +- .../res/drawable/ic_emoji_objects_light.xml | 15 +- .../res/drawable/ic_emoji_people_light.xml | 15 +- .../res/drawable/ic_emoji_places_light.xml | 15 +- .../res/drawable/ic_emoji_recent_light.xml | 15 +- .../res/drawable/ic_emoji_symbols_light.xml | 15 +- .../orca_composer_attach_camera_button.xml | 3 +- .../orca_composer_attach_location_button.xml | 10 +- .../drawable/orca_composer_attach_photo_button.xml | 3 +- .../res/drawable/orca_composer_popup_button.xml | 3 +- .../drawable/orca_composer_popup_button_active.xml | 3 +- .../drawable/orca_emoji_backspace_front_button.xml | 4 +- .../res/drawable/orca_emoji_more_front_button.xml | 4 +- .../res/drawable/orca_emoji_tab_background.xml | 3 +- .../drawable/orca_emoji_tab_dark_background.xml | 6 +- libs/emojicon/res/layout/emojicon_grid.xml | 3 +- libs/emojicon/res/layout/emojicon_item.xml | 29 +- libs/emojicon/res/layout/emojicons.xml | 171 +- libs/emojicon/res/values/attrs.xml | 3 +- .../ankushsachdeva/emojicon/EmojiAdapter.java | 21 +- .../ankushsachdeva/emojicon/EmojiconGridView.java | 68 +- .../ankushsachdeva/emojicon/EmojiconHandler.java | 2 +- .../ankushsachdeva/emojicon/EmojiconRecents.java | 4 +- .../emojicon/EmojiconRecentsGridView.java | 38 +- .../emojicon/EmojiconRecentsManager.java | 13 +- .../ankushsachdeva/emojicon/EmojiconsPopup.java | 740 +- libs/emojicon/src/main/AndroidManifest.xml | 7 +- .../ankushsachdeva/emojicon/EmojiAdapter.java | 21 +- .../ankushsachdeva/emojicon/EmojiconGridView.java | 68 +- .../ankushsachdeva/emojicon/EmojiconHandler.java | 2 +- .../ankushsachdeva/emojicon/EmojiconRecents.java | 4 +- .../emojicon/EmojiconRecentsGridView.java | 38 +- .../emojicon/EmojiconRecentsManager.java | 13 +- .../ankushsachdeva/emojicon/EmojiconsPopup.java | 740 +- .../main/res/drawable/ic_emoji_nature_light.xml | 18 +- .../main/res/drawable/ic_emoji_objects_light.xml | 15 +- .../main/res/drawable/ic_emoji_people_light.xml | 15 +- .../main/res/drawable/ic_emoji_places_light.xml | 15 +- .../main/res/drawable/ic_emoji_recent_light.xml | 15 +- .../main/res/drawable/ic_emoji_symbols_light.xml | 15 +- .../orca_composer_attach_camera_button.xml | 3 +- .../orca_composer_attach_location_button.xml | 10 +- .../drawable/orca_composer_attach_photo_button.xml | 3 +- .../res/drawable/orca_composer_popup_button.xml | 3 +- .../drawable/orca_composer_popup_button_active.xml | 3 +- .../drawable/orca_emoji_backspace_front_button.xml | 4 +- .../res/drawable/orca_emoji_more_front_button.xml | 4 +- .../res/drawable/orca_emoji_tab_background.xml | 3 +- .../drawable/orca_emoji_tab_dark_background.xml | 6 +- .../emojicon/src/main/res/layout/emojicon_grid.xml | 3 +- .../emojicon/src/main/res/layout/emojicon_item.xml | 29 +- libs/emojicon/src/main/res/layout/emojicons.xml | 171 +- libs/emojicon/src/main/res/values/attrs.xml | 3 +- .../messenger/services/PushManagementService.java | 26 +- src/main/AndroidManifest.xml | 188 +- src/main/java/de/pixart/messenger/Config.java | 2 +- .../java/de/pixart/messenger/OmemoActivity.java | 16 +- .../de/pixart/messenger/crypto/OtrService.java | 486 +- .../messenger/crypto/PgpDecryptionService.java | 24 +- .../java/de/pixart/messenger/crypto/PgpEngine.java | 536 +- .../messenger/crypto/XmppDomainVerifier.java | 188 +- .../messenger/crypto/axolotl/AxolotlService.java | 2090 +++--- .../crypto/axolotl/CryptoFailedException.java | 6 +- .../crypto/axolotl/FingerprintStatus.java | 6 +- .../crypto/axolotl/NoSessionsCreatedException.java | 2 +- .../crypto/axolotl/OnMessageCreatedCallback.java | 2 +- .../crypto/axolotl/SQLiteAxolotlStore.java | 834 +-- .../crypto/axolotl/XmppAxolotlMessage.java | 446 +- .../crypto/axolotl/XmppAxolotlSession.java | 218 +- .../de/pixart/messenger/crypto/sasl/Anonymous.java | 30 +- .../de/pixart/messenger/crypto/sasl/DigestMd5.java | 140 +- .../de/pixart/messenger/crypto/sasl/External.java | 36 +- .../de/pixart/messenger/crypto/sasl/Plain.java | 32 +- .../messenger/crypto/sasl/SaslMechanism.java | 107 +- .../de/pixart/messenger/crypto/sasl/ScramSha1.java | 423 +- .../de/pixart/messenger/crypto/sasl/Tokenizer.java | 120 +- .../pixart/messenger/entities/AbstractEntity.java | 18 +- .../java/de/pixart/messenger/entities/Account.java | 1258 ++-- .../de/pixart/messenger/entities/Blockable.java | 14 +- .../de/pixart/messenger/entities/Bookmark.java | 312 +- .../java/de/pixart/messenger/entities/Contact.java | 1059 +-- .../de/pixart/messenger/entities/Conversation.java | 1888 ++--- .../messenger/entities/DownloadableFile.java | 148 +- .../de/pixart/messenger/entities/ListItem.java | 38 +- .../java/de/pixart/messenger/entities/Message.java | 5 +- .../de/pixart/messenger/entities/MucOptions.java | 1320 ++-- .../de/pixart/messenger/entities/Presence.java | 170 +- .../messenger/entities/PresenceTemplate.java | 134 +- .../de/pixart/messenger/entities/Presences.java | 212 +- .../java/de/pixart/messenger/entities/Roster.java | 148 +- .../messenger/entities/ServiceDiscoveryResult.java | 648 +- .../de/pixart/messenger/entities/Transferable.java | 2 +- .../entities/TransferablePlaceholder.java | 59 +- .../messenger/generator/AbstractGenerator.java | 182 +- .../de/pixart/messenger/generator/IqGenerator.java | 687 +- .../messenger/generator/MessageGenerator.java | 400 +- .../messenger/generator/PresenceGenerator.java | 94 +- .../messenger/http/HttpConnectionManager.java | 142 +- .../messenger/http/HttpDownloadConnection.java | 662 +- .../messenger/http/HttpUploadConnection.java | 388 +- .../de/pixart/messenger/parser/AbstractParser.java | 130 +- .../java/de/pixart/messenger/parser/IqParser.java | 652 +- .../de/pixart/messenger/parser/MessageParser.java | 1218 ++-- .../de/pixart/messenger/parser/PresenceParser.java | 454 +- .../messenger/persistance/DatabaseBackend.java | 2510 +++---- .../pixart/messenger/persistance/FileBackend.java | 1828 ++--- .../persistance/OnPhoneContactsMerged.java | 2 +- .../services/AbstractConnectionManager.java | 188 +- .../pixart/messenger/services/AlarmReceiver.java | 2 +- .../pixart/messenger/services/AvatarService.java | 802 +-- .../messenger/services/CheckAppVersionService.java | 2 +- .../services/ContactChooserTargetService.java | 104 +- .../pixart/messenger/services/EventReceiver.java | 28 +- .../messenger/services/ExportLogsService.java | 328 +- .../messenger/services/MessageArchiveService.java | 764 +- .../messenger/services/NotificationService.java | 8 +- .../messenger/services/XmppConnectionService.java | 7565 ++++++++++---------- .../de/pixart/messenger/ui/AboutPreference.java | 20 +- .../ui/AbstractSearchableListItemActivity.java | 202 +- .../de/pixart/messenger/ui/BlockContactDialog.java | 84 +- .../de/pixart/messenger/ui/BlocklistActivity.java | 102 +- .../messenger/ui/ChangePasswordActivity.java | 194 +- .../pixart/messenger/ui/ChooseContactActivity.java | 428 +- .../messenger/ui/ConferenceDetailsActivity.java | 1238 ++-- .../messenger/ui/ContactDetailsActivity.java | 996 +-- .../pixart/messenger/ui/ConversationActivity.java | 3452 ++++----- .../pixart/messenger/ui/ConversationFragment.java | 2630 +++---- .../pixart/messenger/ui/EditAccountActivity.java | 2200 +++--- .../java/de/pixart/messenger/ui/EditMessage.java | 161 +- .../de/pixart/messenger/ui/EnterJidDialog.java | 214 +- .../pixart/messenger/ui/MagicCreateActivity.java | 192 +- .../pixart/messenger/ui/ManageAccountActivity.java | 688 +- .../ui/PublishProfilePictureActivity.java | 547 +- .../de/pixart/messenger/ui/RecordingActivity.java | 254 +- .../pixart/messenger/ui/SetPresenceActivity.java | 400 +- .../de/pixart/messenger/ui/SettingsActivity.java | 468 +- .../de/pixart/messenger/ui/SettingsFragment.java | 80 +- .../pixart/messenger/ui/ShareLocationActivity.java | 90 +- .../de/pixart/messenger/ui/ShareWithActivity.java | 602 +- .../ui/ShowFullscreenMessageActivity.java | 4 +- .../pixart/messenger/ui/ShowLocationActivity.java | 100 +- .../messenger/ui/StartConversationActivity.java | 4 +- src/main/java/de/pixart/messenger/ui/StartUI.java | 4 +- .../de/pixart/messenger/ui/TimePreference.java | 178 +- .../de/pixart/messenger/ui/TrustKeysActivity.java | 606 +- .../java/de/pixart/messenger/ui/UiCallback.java | 6 +- .../de/pixart/messenger/ui/VerifyOTRActivity.java | 770 +- .../de/pixart/messenger/ui/WelcomeActivity.java | 24 +- .../java/de/pixart/messenger/ui/XmppActivity.java | 2410 +++---- .../messenger/ui/adapter/AccountAdapter.java | 74 +- .../messenger/ui/adapter/ConversationAdapter.java | 116 +- .../messenger/ui/adapter/KnownHostsAdapter.java | 108 +- .../messenger/ui/adapter/ListItemAdapter.java | 302 +- .../messenger/ui/adapter/MessageAdapter.java | 1874 ++--- .../ui/forms/FormBooleanFieldWrapper.java | 114 +- .../messenger/ui/forms/FormFieldFactory.java | 35 +- .../messenger/ui/forms/FormFieldWrapper.java | 152 +- .../ui/forms/FormJidSingleFieldWrapper.java | 54 +- .../messenger/ui/forms/FormTextFieldWrapper.java | 138 +- .../de/pixart/messenger/ui/forms/FormWrapper.java | 98 +- .../ui/widget/ClickableMovementMethod.java | 56 +- .../java/de/pixart/messenger/ui/widget/Switch.java | 102 +- .../messenger/utils/ConversationsFileObserver.java | 14 +- .../de/pixart/messenger/utils/CryptoHelper.java | 370 +- .../java/de/pixart/messenger/utils/DNSHelper.java | 464 +- .../pixart/messenger/utils/ExceptionHandler.java | 32 +- .../de/pixart/messenger/utils/ExceptionHelper.java | 195 +- .../java/de/pixart/messenger/utils/ExifHelper.java | 4 +- .../java/de/pixart/messenger/utils/FileUtils.java | 282 +- .../java/de/pixart/messenger/utils/GeoHelper.java | 120 +- .../java/de/pixart/messenger/utils/MimeUtils.java | 15 + .../utils/OnPhoneContactsLoadedListener.java | 2 +- .../java/de/pixart/messenger/utils/PRNGFixes.java | 519 +- .../de/pixart/messenger/utils/PhoneHelper.java | 238 +- .../de/pixart/messenger/utils/SSLSocketHelper.java | 102 +- .../utils/SerialSingleThreadExecutor.java | 78 +- .../pixart/messenger/utils/SocksSocketFactory.java | 84 +- .../java/de/pixart/messenger/utils/UIHelper.java | 556 +- .../java/de/pixart/messenger/utils/XmlHelper.java | 18 +- src/main/java/de/pixart/messenger/utils/Xmlns.java | 10 +- .../java/de/pixart/messenger/utils/XmppUri.java | 271 +- .../messenger/utils/video/MediaController.java | 2 +- .../messenger/utils/video/TextureRenderer.java | 28 +- .../de/pixart/messenger/utils/video/Track.java | 6 +- src/main/java/de/pixart/messenger/xml/Element.java | 348 +- src/main/java/de/pixart/messenger/xml/Tag.java | 186 +- .../java/de/pixart/messenger/xml/TagWriter.java | 162 +- .../java/de/pixart/messenger/xml/XmlReader.java | 202 +- .../xmpp/OnAdvancedStreamFeaturesLoaded.java | 2 +- .../de/pixart/messenger/xmpp/OnBindListener.java | 2 +- .../messenger/xmpp/OnContactStatusChanged.java | 2 +- .../pixart/messenger/xmpp/OnIqPacketReceived.java | 2 +- .../pixart/messenger/xmpp/OnKeyStatusUpdated.java | 2 +- .../messenger/xmpp/OnMessageAcknowledged.java | 2 +- .../messenger/xmpp/OnMessagePacketReceived.java | 2 +- .../messenger/xmpp/OnPresencePacketReceived.java | 2 +- .../de/pixart/messenger/xmpp/OnStatusChanged.java | 2 +- .../pixart/messenger/xmpp/OnUpdateBlocklist.java | 16 +- .../de/pixart/messenger/xmpp/XmppConnection.java | 3142 ++++---- .../pixart/messenger/xmpp/chatstate/ChatState.java | 46 +- .../java/de/pixart/messenger/xmpp/forms/Data.java | 174 +- .../java/de/pixart/messenger/xmpp/forms/Field.java | 116 +- .../messenger/xmpp/jid/InvalidJidException.java | 4 +- .../java/de/pixart/messenger/xmpp/jid/Jid.java | 398 +- .../messenger/xmpp/jingle/JingleCandidate.java | 250 +- .../messenger/xmpp/jingle/JingleConnection.java | 2038 +++--- .../xmpp/jingle/JingleConnectionManager.java | 290 +- .../xmpp/jingle/JingleInbandTransport.java | 424 +- .../xmpp/jingle/JingleSocks5Transport.java | 374 +- .../messenger/xmpp/jingle/JingleTransport.java | 12 +- .../jingle/OnFileTransmissionStatusChanged.java | 4 +- .../xmpp/jingle/OnJinglePacketReceived.java | 2 +- .../xmpp/jingle/OnPrimaryCandidateFound.java | 2 +- .../xmpp/jingle/OnTransportConnected.java | 4 +- .../messenger/xmpp/jingle/stanzas/Content.java | 242 +- .../xmpp/jingle/stanzas/JinglePacket.java | 150 +- .../messenger/xmpp/jingle/stanzas/Reason.java | 12 +- .../java/de/pixart/messenger/xmpp/pep/Avatar.java | 172 +- .../stanzas/AbstractAcknowledgeableStanza.java | 40 +- .../messenger/xmpp/stanzas/AbstractStanza.java | 82 +- .../de/pixart/messenger/xmpp/stanzas/IqPacket.java | 110 +- .../messenger/xmpp/stanzas/MessagePacket.java | 164 +- .../messenger/xmpp/stanzas/PresencePacket.java | 6 +- .../messenger/xmpp/stanzas/csi/ActivePacket.java | 8 +- .../messenger/xmpp/stanzas/csi/InactivePacket.java | 8 +- .../xmpp/stanzas/streammgmt/AckPacket.java | 10 +- .../xmpp/stanzas/streammgmt/EnablePacket.java | 10 +- .../xmpp/stanzas/streammgmt/RequestPacket.java | 8 +- .../xmpp/stanzas/streammgmt/ResumePacket.java | 12 +- src/main/res/drawable/actionbar_tab_indicator.xml | 16 +- src/main/res/drawable/es_slidingpane_shadow.xml | 2 +- src/main/res/drawable/grey.xml | 2 +- src/main/res/drawable/greybackground.xml | 2 +- src/main/res/drawable/infocard_border.xml | 7 +- src/main/res/drawable/message_border.xml | 2 +- src/main/res/drawable/snackbar.xml | 2 +- src/main/res/drawable/switch_back_off.xml | 12 +- src/main/res/drawable/switch_back_on.xml | 8 +- src/main/res/drawable/switch_thumb.xml | 14 +- .../fragment_conversations_overview.xml | 5 +- src/main/res/layout/ab_title.xml | 4 +- src/main/res/layout/account_row.xml | 14 +- src/main/res/layout/actionview_search.xml | 6 +- src/main/res/layout/activity_about.xml | 2 +- src/main/res/layout/activity_change_password.xml | 191 +- src/main/res/layout/activity_choose_contact.xml | 2 +- src/main/res/layout/activity_contact_details.xml | 14 +- src/main/res/layout/activity_edit_account.xml | 46 +- .../res/layout/activity_fullscreen_message.xml | 3 +- src/main/res/layout/activity_muc_details.xml | 146 +- .../layout/activity_publish_profile_picture.xml | 173 +- src/main/res/layout/activity_recording.xml | 8 +- src/main/res/layout/activity_set_presence.xml | 16 +- src/main/res/layout/activity_share_locaction.xml | 23 +- src/main/res/layout/activity_show_locaction.xml | 10 +- .../res/layout/activity_start_conversation.xml | 2 +- src/main/res/layout/activity_trust_keys.xml | 17 +- src/main/res/layout/activity_updater.xml | 16 +- src/main/res/layout/activity_verify_otr.xml | 296 +- src/main/res/layout/captcha.xml | 5 +- src/main/res/layout/certificate_information.xml | 41 +- src/main/res/layout/contact.xml | 17 +- src/main/res/layout/contact_key.xml | 9 +- src/main/res/layout/conversation_list_row.xml | 36 +- src/main/res/layout/dialog_block_contact.xml | 3 +- src/main/res/layout/dialog_show_password.xml | 3 +- src/main/res/layout/form_boolean.xml | 11 +- src/main/res/layout/form_text.xml | 13 +- src/main/res/layout/fragment_conversation.xml | 6 +- .../res/layout/fragment_conversations_overview.xml | 10 +- src/main/res/layout/join_conference_dialog.xml | 18 +- src/main/res/layout/keys_card.xml | 27 +- src/main/res/layout/list_item_tag.xml | 3 +- src/main/res/layout/magic_create.xml | 29 +- src/main/res/layout/manage_accounts.xml | 3 +- src/main/res/layout/message_received.xml | 18 +- src/main/res/layout/message_sent.xml | 19 +- src/main/res/layout/message_status.xml | 25 +- src/main/res/layout/password.xml | 3 +- src/main/res/layout/presence_template.xml | 56 +- src/main/res/layout/quickedit.xml | 4 +- src/main/res/layout/share_with.xml | 2 +- src/main/res/layout/show_location_infowindow.xml | 5 +- src/main/res/layout/simple_list_item.xml | 21 +- src/main/res/menu/attachment_choices.xml | 14 +- src/main/res/menu/change_presence.xml | 6 +- src/main/res/menu/choose_contact.xml | 4 +- src/main/res/menu/conference_context.xml | 6 +- src/main/res/menu/contact_context.xml | 10 +- src/main/res/menu/contact_details.xml | 12 +- src/main/res/menu/conversations.xml | 52 +- src/main/res/menu/editaccount.xml | 22 +- src/main/res/menu/encryption_choices.xml | 12 +- src/main/res/menu/manageaccounts.xml | 32 +- src/main/res/menu/manageaccounts_context.xml | 12 +- src/main/res/menu/message_context.xml | 24 +- src/main/res/menu/muc_details.xml | 10 +- src/main/res/menu/muc_details_context.xml | 22 +- src/main/res/menu/omemo_key_context.xml | 4 +- src/main/res/menu/publish_avatar.xml | 2 +- src/main/res/menu/select_multiple.xml | 2 +- src/main/res/menu/share_with.xml | 4 +- src/main/res/menu/showlocation.xml | 2 +- src/main/res/menu/start_conversation.xml | 6 +- src/main/res/menu/verification_choices.xml | 4 +- src/main/res/menu/verify_otr.xml | 8 +- src/main/res/values-v21/dimens.xml | 4 +- src/main/res/values/arrays.xml | 170 +- src/main/res/values/attrs.xml | 54 +- src/main/res/values/colors.xml | 28 +- src/main/res/values/dimens.xml | 10 +- src/main/res/values/ids.xml | 4 +- src/main/res/values/strings.xml | 1336 ++-- src/main/res/values/themes.xml | 7 +- src/main/res/xml/file_paths.xml | 4 +- src/main/res/xml/preferences.xml | 4 +- .../messenger/services/PushManagementService.java | 26 +- src/playstore/AndroidManifest.xml | 21 +- .../messenger/services/InstanceIdService.java | 12 +- .../messenger/services/PushManagementService.java | 188 +- .../messenger/services/PushMessageReceiver.java | 14 +- 391 files changed, 40047 insertions(+), 42158 deletions(-) diff --git a/art/conversations_baloon.svg b/art/conversations_baloon.svg index 076aa20eb..b7d4a6777 100644 --- a/art/conversations_baloon.svg +++ b/art/conversations_baloon.svg @@ -1,288 +1,154 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/art/conversations_mono.svg b/art/conversations_mono.svg index 93ba8a1ba..c1428ea29 100644 --- a/art/conversations_mono.svg +++ b/art/conversations_mono.svg @@ -1,325 +1,129 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/art/conversations_mono_dashed.svg b/art/conversations_mono_dashed.svg index cce980890..985964a3f 100644 --- a/art/conversations_mono_dashed.svg +++ b/art/conversations_mono_dashed.svg @@ -1,388 +1,176 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/art/ic_read_indicator.svg b/art/ic_read_indicator.svg index 343232ca6..7580e2ae6 100644 --- a/art/ic_read_indicator.svg +++ b/art/ic_read_indicator.svg @@ -1,51 +1,30 @@ - - + - - - - - - image/svg+xml - - - - - - - + height="576.55585" id="svg2" inkscape:version="0.48.1 r9760" + sodipodi:docname="Check-71-128-204-brightblue.svg"> + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_received_indicator.svg b/art/ic_received_indicator.svg index a12292f51..c7833a741 100644 --- a/art/ic_received_indicator.svg +++ b/art/ic_received_indicator.svg @@ -1,4 +1,6 @@ - + \ No newline at end of file diff --git a/art/ic_send_cancel_away.svg b/art/ic_send_cancel_away.svg index 76c30da15..fa803779c 100644 --- a/art/ic_send_cancel_away.svg +++ b/art/ic_send_cancel_away.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_cancel_dnd.svg b/art/ic_send_cancel_dnd.svg index 0db9b04e7..9501f7441 100644 --- a/art/ic_send_cancel_dnd.svg +++ b/art/ic_send_cancel_dnd.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_cancel_offline.svg b/art/ic_send_cancel_offline.svg index 73a3575a5..9d37a350f 100644 --- a/art/ic_send_cancel_offline.svg +++ b/art/ic_send_cancel_offline.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_cancel_online.svg b/art/ic_send_cancel_online.svg index eb5f97506..53ac9c8b1 100644 --- a/art/ic_send_cancel_online.svg +++ b/art/ic_send_cancel_online.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_location_away.svg b/art/ic_send_location_away.svg index 410597c34..8a171774e 100644 --- a/art/ic_send_location_away.svg +++ b/art/ic_send_location_away.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_location_dnd.svg b/art/ic_send_location_dnd.svg index 97d15d8a5..6fc835bc7 100644 --- a/art/ic_send_location_dnd.svg +++ b/art/ic_send_location_dnd.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_location_offline.svg b/art/ic_send_location_offline.svg index 219ec427f..e957a15b2 100644 --- a/art/ic_send_location_offline.svg +++ b/art/ic_send_location_offline.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_location_online.svg b/art/ic_send_location_online.svg index dd50df43b..d82369d69 100644 --- a/art/ic_send_location_online.svg +++ b/art/ic_send_location_online.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_photo_away.svg b/art/ic_send_photo_away.svg index f2f5e8f22..9c605e7cf 100644 --- a/art/ic_send_photo_away.svg +++ b/art/ic_send_photo_away.svg @@ -1,49 +1,27 @@ - - - - - image/svg+xml - - - - - - - - + + + + + image/svg+xml + + + + + + + + diff --git a/art/ic_send_photo_dnd.svg b/art/ic_send_photo_dnd.svg index 5c26150d9..6e5562cd9 100644 --- a/art/ic_send_photo_dnd.svg +++ b/art/ic_send_photo_dnd.svg @@ -1,49 +1,27 @@ - - - - - image/svg+xml - - - - - - - - + + + + + image/svg+xml + + + + + + + + diff --git a/art/ic_send_photo_offline.svg b/art/ic_send_photo_offline.svg index e652d34a9..fcbab71e4 100644 --- a/art/ic_send_photo_offline.svg +++ b/art/ic_send_photo_offline.svg @@ -1,49 +1,27 @@ - - - - - image/svg+xml - - - - - - - - + + + + + image/svg+xml + + + + + + + + diff --git a/art/ic_send_photo_online.svg b/art/ic_send_photo_online.svg index c7afb231a..3c4ccceae 100644 --- a/art/ic_send_photo_online.svg +++ b/art/ic_send_photo_online.svg @@ -1,49 +1,27 @@ - - - - - image/svg+xml - - - - - - - - + + + + + image/svg+xml + + + + + + + + diff --git a/art/ic_send_picture_away.svg b/art/ic_send_picture_away.svg index ba6dcc716..5a2bfaf28 100644 --- a/art/ic_send_picture_away.svg +++ b/art/ic_send_picture_away.svg @@ -1,44 +1,27 @@ - - - - - image/svg+xml - - - - - - - - + + + + + image/svg+xml + + + + + + + + diff --git a/art/ic_send_picture_dnd.svg b/art/ic_send_picture_dnd.svg index 1f13a1bba..2666b76ee 100644 --- a/art/ic_send_picture_dnd.svg +++ b/art/ic_send_picture_dnd.svg @@ -1,44 +1,27 @@ - - - - - image/svg+xml - - - - - - - - + + + + + image/svg+xml + + + + + + + + diff --git a/art/ic_send_picture_offline.svg b/art/ic_send_picture_offline.svg index 0d4221b1d..cb77ee998 100644 --- a/art/ic_send_picture_offline.svg +++ b/art/ic_send_picture_offline.svg @@ -1,44 +1,27 @@ - - - - - image/svg+xml - - - - - - - - + + + + + image/svg+xml + + + + + + + + diff --git a/art/ic_send_picture_online.svg b/art/ic_send_picture_online.svg index 271951fbf..ab8109c7f 100644 --- a/art/ic_send_picture_online.svg +++ b/art/ic_send_picture_online.svg @@ -1,44 +1,27 @@ - - - - - image/svg+xml - - - - - - - - + + + + + image/svg+xml + + + + + + + + diff --git a/art/ic_send_text_away.svg b/art/ic_send_text_away.svg index c4efbe568..f6b02b4f9 100644 --- a/art/ic_send_text_away.svg +++ b/art/ic_send_text_away.svg @@ -1,58 +1,33 @@ - - + - - - - - image/svg+xml - - - - - - - - - - + + + + image/svg+xml + + + + + + + + + + diff --git a/art/ic_send_text_dnd.svg b/art/ic_send_text_dnd.svg index c6f67133a..0ebb40f41 100644 --- a/art/ic_send_text_dnd.svg +++ b/art/ic_send_text_dnd.svg @@ -1,58 +1,33 @@ - - + - - - - - image/svg+xml - - - - - - - - - - + + + + image/svg+xml + + + + + + + + + + diff --git a/art/ic_send_text_offline.svg b/art/ic_send_text_offline.svg index 6d3faa93e..25ffc5f61 100644 --- a/art/ic_send_text_offline.svg +++ b/art/ic_send_text_offline.svg @@ -1,58 +1,34 @@ - - + - - - - - image/svg+xml - - - - - - - - - - + + + + image/svg+xml + + + + + + + + + + diff --git a/art/ic_send_text_online.svg b/art/ic_send_text_online.svg index 747029f74..aec29e306 100644 --- a/art/ic_send_text_online.svg +++ b/art/ic_send_text_online.svg @@ -1,58 +1,33 @@ - - + - - - - - image/svg+xml - - - - - - - - - - + + + + image/svg+xml + + + + + + + + + + diff --git a/art/ic_send_video_away.svg b/art/ic_send_video_away.svg index cd1316950..c98417a27 100644 --- a/art/ic_send_video_away.svg +++ b/art/ic_send_video_away.svg @@ -1,48 +1,28 @@ - - - - - image/svg+xml - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + diff --git a/art/ic_send_video_dnd.svg b/art/ic_send_video_dnd.svg index 8c4e477ea..cbf7d5775 100644 --- a/art/ic_send_video_dnd.svg +++ b/art/ic_send_video_dnd.svg @@ -1,48 +1,28 @@ - - - - - image/svg+xml - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + diff --git a/art/ic_send_video_offline.svg b/art/ic_send_video_offline.svg index c0e3ecc04..0426a7233 100644 --- a/art/ic_send_video_offline.svg +++ b/art/ic_send_video_offline.svg @@ -1,48 +1,28 @@ - - - - - image/svg+xml - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + diff --git a/art/ic_send_video_online.svg b/art/ic_send_video_online.svg index c8ba1818a..021da4eb5 100644 --- a/art/ic_send_video_online.svg +++ b/art/ic_send_video_online.svg @@ -1,48 +1,28 @@ - - - - - image/svg+xml - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + diff --git a/art/ic_send_voice_away.svg b/art/ic_send_voice_away.svg index 78534750c..f1c303984 100644 --- a/art/ic_send_voice_away.svg +++ b/art/ic_send_voice_away.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_voice_dnd.svg b/art/ic_send_voice_dnd.svg index 4ef81de7f..fdd21b126 100644 --- a/art/ic_send_voice_dnd.svg +++ b/art/ic_send_voice_dnd.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_voice_offline.svg b/art/ic_send_voice_offline.svg index fbbf589f9..41edd5b65 100644 --- a/art/ic_send_voice_offline.svg +++ b/art/ic_send_voice_offline.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_send_voice_online.svg b/art/ic_send_voice_online.svg index 77c71d881..e73c6697b 100644 --- a/art/ic_send_voice_online.svg +++ b/art/ic_send_voice_online.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/ic_verified_fingerprint.svg b/art/ic_verified_fingerprint.svg index 5adfad356..625b29759 100644 --- a/art/ic_verified_fingerprint.svg +++ b/art/ic_verified_fingerprint.svg @@ -1,43 +1,26 @@ - - - - - image/svg+xml - - - - - - - + + + + + image/svg+xml + + + + + + + diff --git a/art/md_switch_thumb_disable.svg b/art/md_switch_thumb_disable.svg index 63ba6bc1f..6639218fa 100644 --- a/art/md_switch_thumb_disable.svg +++ b/art/md_switch_thumb_disable.svg @@ -1,144 +1,67 @@ - - + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/art/md_switch_thumb_off_normal.svg b/art/md_switch_thumb_off_normal.svg index a902b12f4..9c86e37d3 100644 --- a/art/md_switch_thumb_off_normal.svg +++ b/art/md_switch_thumb_off_normal.svg @@ -1,141 +1,63 @@ - - + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/art/md_switch_thumb_off_pressed.svg b/art/md_switch_thumb_off_pressed.svg index 47a8d3bd4..fecb6bc2d 100644 --- a/art/md_switch_thumb_off_pressed.svg +++ b/art/md_switch_thumb_off_pressed.svg @@ -1,147 +1,66 @@ - - + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/art/md_switch_thumb_on_normal.svg b/art/md_switch_thumb_on_normal.svg index 0082a8bf1..8b66115e2 100644 --- a/art/md_switch_thumb_on_normal.svg +++ b/art/md_switch_thumb_on_normal.svg @@ -1,134 +1,61 @@ - - + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/art/md_switch_thumb_on_pressed.svg b/art/md_switch_thumb_on_pressed.svg index cf828b3a4..90d14cbe4 100644 --- a/art/md_switch_thumb_on_pressed.svg +++ b/art/md_switch_thumb_on_pressed.svg @@ -1,150 +1,70 @@ - - + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + - - + style="opacity:1;fill:#0093e8;fill-opacity:0.10196078;fill-rule:nonzero;stroke:none;stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.10196078" + id="path4819" cx="60" cy="62.5" r="60" /> + + + + + + + - diff --git a/art/message_bubble_received.svg b/art/message_bubble_received.svg index ea242146f..5e3d9fe0e 100644 --- a/art/message_bubble_received.svg +++ b/art/message_bubble_received.svg @@ -1,155 +1,60 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + - diff --git a/art/message_bubble_received_warning.svg b/art/message_bubble_received_warning.svg index d76197914..e24f27b94 100644 --- a/art/message_bubble_received_warning.svg +++ b/art/message_bubble_received_warning.svg @@ -1,155 +1,60 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + - diff --git a/art/message_bubble_received_white.svg b/art/message_bubble_received_white.svg index ea242146f..5e3d9fe0e 100644 --- a/art/message_bubble_received_white.svg +++ b/art/message_bubble_received_white.svg @@ -1,155 +1,60 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + - diff --git a/art/message_bubble_sent.svg b/art/message_bubble_sent.svg index 06040a9f0..025ea3a73 100644 --- a/art/message_bubble_sent.svg +++ b/art/message_bubble_sent.svg @@ -1,155 +1,60 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + - diff --git a/art/message_bubble_sent_white.svg b/art/message_bubble_sent_white.svg index c5cfa5829..53ea90940 100644 --- a/art/message_bubble_sent_white.svg +++ b/art/message_bubble_sent_white.svg @@ -1,155 +1,60 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + - diff --git a/art/omemo_logo.svg b/art/omemo_logo.svg index b2f821c69..d6980027c 100644 --- a/art/omemo_logo.svg +++ b/art/omemo_logo.svg @@ -1,263 +1,163 @@ - - + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:version="0.91 r13725" width="2367.5596" height="1451.5084" + viewBox="0 0 2367.5595 1451.5084" sodipodi:docname="omemo_logo.svg"> + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/art/play_video.svg b/art/play_video.svg index 02df3fb36..72d07433a 100644 --- a/art/play_video.svg +++ b/art/play_video.svg @@ -1,48 +1,29 @@ - - - - - image/svg+xml - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + diff --git a/libs/MemorizingTrustManager/AndroidManifest.xml b/libs/MemorizingTrustManager/AndroidManifest.xml index c125afe42..4d3a2b41c 100644 --- a/libs/MemorizingTrustManager/AndroidManifest.xml +++ b/libs/MemorizingTrustManager/AndroidManifest.xml @@ -1,11 +1,12 @@ + package="de.duenndns.ssl" + android:versionCode="1" + android:versionName="1.0"> - - - + + + diff --git a/libs/MemorizingTrustManager/ant.properties b/libs/MemorizingTrustManager/ant.properties index ee52d86d9..21ef4e321 100644 --- a/libs/MemorizingTrustManager/ant.properties +++ b/libs/MemorizingTrustManager/ant.properties @@ -2,13 +2,10 @@ # # This file must be checked in Version Control Systems, as it is # integral to the build system of your project. - # This file is only used by the Ant script. - # You can use this to override default values such as # 'source.dir' for the location of your java source folder and # 'out.dir' for the location of your output folder. - # You can also use it define how the release builds are signed by declaring # the following properties: # 'key.store' for the location of your keystore and diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle index a3b4c5106..12072b81f 100644 --- a/libs/MemorizingTrustManager/build.gradle +++ b/libs/MemorizingTrustManager/build.gradle @@ -1,32 +1,32 @@ buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' - } + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.2.2' + } } apply plugin: 'android-library' android { - compileSdkVersion 19 - buildToolsVersion "19.1" - defaultConfig { - minSdkVersion 7 - targetSdkVersion 19 - } + compileSdkVersion 19 + buildToolsVersion "19.1" + defaultConfig { + minSdkVersion 7 + targetSdkVersion 19 + } - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - } + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + } } diff --git a/libs/MemorizingTrustManager/build.xml b/libs/MemorizingTrustManager/build.xml index 06cf485c1..15b0b0104 100644 --- a/libs/MemorizingTrustManager/build.xml +++ b/libs/MemorizingTrustManager/build.xml @@ -50,9 +50,8 @@ + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." + unless="sdk.dir" /> - + + diff --git a/libs/MemorizingTrustManager/example/ant.properties b/libs/MemorizingTrustManager/example/ant.properties index 27fcaadd8..2f48b3655 100644 --- a/libs/MemorizingTrustManager/example/ant.properties +++ b/libs/MemorizingTrustManager/example/ant.properties @@ -2,17 +2,13 @@ # # This file must be checked in Version Control Systems, as it is # integral to the build system of your project. - # This file is only used by the Ant script. - # You can use this to override default values such as # 'source.dir' for the location of your java source folder and # 'out.dir' for the location of your output folder. - # You can also use it define how the release builds are signed by declaring # the following properties: # 'key.store' for the location of your keystore and # 'key.alias' for the name of the key to use. # The password will be asked during the build when you use the 'release' target. - application.package=de.duenndns.mtmexample diff --git a/libs/MemorizingTrustManager/example/build.gradle b/libs/MemorizingTrustManager/example/build.gradle index 00bfe99e2..a07fbe87b 100644 --- a/libs/MemorizingTrustManager/example/build.gradle +++ b/libs/MemorizingTrustManager/example/build.gradle @@ -1,23 +1,23 @@ apply plugin: 'android' dependencies { - compile rootProject + compile rootProject } android { - compileSdkVersion 19 - buildToolsVersion "19.1" - defaultConfig { - minSdkVersion 7 - targetSdkVersion 19 - } + compileSdkVersion 19 + buildToolsVersion "19.1" + defaultConfig { + minSdkVersion 7 + targetSdkVersion 19 + } - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] - } - } + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + } + } } diff --git a/libs/MemorizingTrustManager/example/build.xml b/libs/MemorizingTrustManager/example/build.xml index cdc74917d..0c61a2917 100644 --- a/libs/MemorizingTrustManager/example/build.xml +++ b/libs/MemorizingTrustManager/example/build.xml @@ -50,9 +50,8 @@ + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." + unless="sdk.dir" /> - + android:color="#F2F2F2"> + android:paddingTop="5dp"> - + - diff --git a/libs/emojicon/lint.xml b/libs/emojicon/lint.xml index 8423c0ef9..c70207fba 100644 --- a/libs/emojicon/lint.xml +++ b/libs/emojicon/lint.xml @@ -1,3 +1,2 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/libs/emojicon/project.properties b/libs/emojicon/project.properties index 91d2b0246..414284d51 100644 --- a/libs/emojicon/project.properties +++ b/libs/emojicon/project.properties @@ -9,7 +9,6 @@ # # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - # Project target. target=android-19 android.library=true diff --git a/libs/emojicon/res/drawable/ic_emoji_nature_light.xml b/libs/emojicon/res/drawable/ic_emoji_nature_light.xml index 543409e03..87464fb1e 100644 --- a/libs/emojicon/res/drawable/ic_emoji_nature_light.xml +++ b/libs/emojicon/res/drawable/ic_emoji_nature_light.xml @@ -1,5 +1,4 @@ - - - - - - + + + + diff --git a/libs/emojicon/res/drawable/ic_emoji_objects_light.xml b/libs/emojicon/res/drawable/ic_emoji_objects_light.xml index 4096e695b..74c80e3d0 100644 --- a/libs/emojicon/res/drawable/ic_emoji_objects_light.xml +++ b/libs/emojicon/res/drawable/ic_emoji_objects_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/res/drawable/ic_emoji_people_light.xml b/libs/emojicon/res/drawable/ic_emoji_people_light.xml index ea9e406a4..06f7aebbf 100644 --- a/libs/emojicon/res/drawable/ic_emoji_people_light.xml +++ b/libs/emojicon/res/drawable/ic_emoji_people_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/res/drawable/ic_emoji_places_light.xml b/libs/emojicon/res/drawable/ic_emoji_places_light.xml index 312cad9c3..36f258876 100644 --- a/libs/emojicon/res/drawable/ic_emoji_places_light.xml +++ b/libs/emojicon/res/drawable/ic_emoji_places_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/res/drawable/ic_emoji_recent_light.xml b/libs/emojicon/res/drawable/ic_emoji_recent_light.xml index 8c2123f83..90f2c8565 100644 --- a/libs/emojicon/res/drawable/ic_emoji_recent_light.xml +++ b/libs/emojicon/res/drawable/ic_emoji_recent_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/res/drawable/ic_emoji_symbols_light.xml b/libs/emojicon/res/drawable/ic_emoji_symbols_light.xml index 79aaf0fc5..9077c3289 100644 --- a/libs/emojicon/res/drawable/ic_emoji_symbols_light.xml +++ b/libs/emojicon/res/drawable/ic_emoji_symbols_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/res/drawable/orca_composer_attach_camera_button.xml b/libs/emojicon/res/drawable/orca_composer_attach_camera_button.xml index 0b255fb27..56e8d0484 100644 --- a/libs/emojicon/res/drawable/orca_composer_attach_camera_button.xml +++ b/libs/emojicon/res/drawable/orca_composer_attach_camera_button.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/libs/emojicon/res/drawable/orca_composer_attach_location_button.xml b/libs/emojicon/res/drawable/orca_composer_attach_location_button.xml index 4971113aa..be898ebcf 100644 --- a/libs/emojicon/res/drawable/orca_composer_attach_location_button.xml +++ b/libs/emojicon/res/drawable/orca_composer_attach_location_button.xml @@ -1,5 +1,4 @@ - - - - - + + + \ No newline at end of file diff --git a/libs/emojicon/res/drawable/orca_composer_attach_photo_button.xml b/libs/emojicon/res/drawable/orca_composer_attach_photo_button.xml index ca7508dd9..21f8e8e6c 100644 --- a/libs/emojicon/res/drawable/orca_composer_attach_photo_button.xml +++ b/libs/emojicon/res/drawable/orca_composer_attach_photo_button.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/libs/emojicon/res/drawable/orca_composer_popup_button.xml b/libs/emojicon/res/drawable/orca_composer_popup_button.xml index d43dc26e4..dccfb4848 100644 --- a/libs/emojicon/res/drawable/orca_composer_popup_button.xml +++ b/libs/emojicon/res/drawable/orca_composer_popup_button.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/libs/emojicon/res/drawable/orca_composer_popup_button_active.xml b/libs/emojicon/res/drawable/orca_composer_popup_button_active.xml index f5e40ef8c..556d0151b 100644 --- a/libs/emojicon/res/drawable/orca_composer_popup_button_active.xml +++ b/libs/emojicon/res/drawable/orca_composer_popup_button_active.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/libs/emojicon/res/drawable/orca_emoji_backspace_front_button.xml b/libs/emojicon/res/drawable/orca_emoji_backspace_front_button.xml index a2d2f5b62..e922eb686 100644 --- a/libs/emojicon/res/drawable/orca_emoji_backspace_front_button.xml +++ b/libs/emojicon/res/drawable/orca_emoji_backspace_front_button.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/libs/emojicon/res/drawable/orca_emoji_more_front_button.xml b/libs/emojicon/res/drawable/orca_emoji_more_front_button.xml index a799d56d9..3e0e9f6f0 100644 --- a/libs/emojicon/res/drawable/orca_emoji_more_front_button.xml +++ b/libs/emojicon/res/drawable/orca_emoji_more_front_button.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/libs/emojicon/res/drawable/orca_emoji_tab_background.xml b/libs/emojicon/res/drawable/orca_emoji_tab_background.xml index f68e6212b..d597dc03a 100644 --- a/libs/emojicon/res/drawable/orca_emoji_tab_background.xml +++ b/libs/emojicon/res/drawable/orca_emoji_tab_background.xml @@ -1,6 +1,5 @@ - + diff --git a/libs/emojicon/res/drawable/orca_emoji_tab_dark_background.xml b/libs/emojicon/res/drawable/orca_emoji_tab_dark_background.xml index 07ff608c9..f0b0d1a66 100644 --- a/libs/emojicon/res/drawable/orca_emoji_tab_dark_background.xml +++ b/libs/emojicon/res/drawable/orca_emoji_tab_dark_background.xml @@ -1,5 +1,4 @@ - - - + diff --git a/libs/emojicon/res/layout/emojicon_grid.xml b/libs/emojicon/res/layout/emojicon_grid.xml index 457f8756b..7e1579c3f 100644 --- a/libs/emojicon/res/layout/emojicon_grid.xml +++ b/libs/emojicon/res/layout/emojicon_grid.xml @@ -1,5 +1,4 @@ - - - + + + android:layout_gravity="center" + android:id="@+id/emojicon_icon" + android:layout_width="36dip" + android:layout_height="36dip" + emojicon:emojiconSize="30dip" + android:focusable="false" + android:focusableInTouchMode="false" + android:gravity="center" /> \ No newline at end of file diff --git a/libs/emojicon/res/layout/emojicons.xml b/libs/emojicon/res/layout/emojicons.xml index 287923d1b..e61c2fb34 100644 --- a/libs/emojicon/res/layout/emojicons.xml +++ b/libs/emojicon/res/layout/emojicons.xml @@ -1,5 +1,4 @@ - - + android:background="@drawable/keyboard_background_holo" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + android:id="@+id/emojis_tab" + android:layout_width="match_parent" + android:layout_height="50dip" + android:layout_alignParentTop="true" + android:orientation="horizontal"> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_0_recents" + android:src="@drawable/ic_emoji_recent_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_1_people" + android:src="@drawable/ic_emoji_people_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_2_nature" + android:src="@drawable/ic_emoji_nature_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_3_objects" + android:src="@drawable/ic_emoji_objects_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_4_cars" + android:src="@drawable/ic_emoji_places_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_5_punctuation" + android:src="@drawable/ic_emoji_symbols_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:id="@+id/emojis_backspace" + android:src="@drawable/sym_keyboard_delete_holo_dark" /> + + android:layout_alignParentBottom="true" /> + + android:background="#8f8f8f" /> diff --git a/libs/emojicon/res/values/attrs.xml b/libs/emojicon/res/values/attrs.xml index 9810158dc..f4f21f903 100644 --- a/libs/emojicon/res/values/attrs.xml +++ b/libs/emojicon/res/values/attrs.xml @@ -1,5 +1,4 @@ - - - - - - + + + + diff --git a/libs/emojicon/src/main/res/drawable/ic_emoji_objects_light.xml b/libs/emojicon/src/main/res/drawable/ic_emoji_objects_light.xml index 4096e695b..74c80e3d0 100644 --- a/libs/emojicon/src/main/res/drawable/ic_emoji_objects_light.xml +++ b/libs/emojicon/src/main/res/drawable/ic_emoji_objects_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/src/main/res/drawable/ic_emoji_people_light.xml b/libs/emojicon/src/main/res/drawable/ic_emoji_people_light.xml index ea9e406a4..06f7aebbf 100644 --- a/libs/emojicon/src/main/res/drawable/ic_emoji_people_light.xml +++ b/libs/emojicon/src/main/res/drawable/ic_emoji_people_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/src/main/res/drawable/ic_emoji_places_light.xml b/libs/emojicon/src/main/res/drawable/ic_emoji_places_light.xml index 312cad9c3..36f258876 100644 --- a/libs/emojicon/src/main/res/drawable/ic_emoji_places_light.xml +++ b/libs/emojicon/src/main/res/drawable/ic_emoji_places_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/src/main/res/drawable/ic_emoji_recent_light.xml b/libs/emojicon/src/main/res/drawable/ic_emoji_recent_light.xml index 8c2123f83..90f2c8565 100644 --- a/libs/emojicon/src/main/res/drawable/ic_emoji_recent_light.xml +++ b/libs/emojicon/src/main/res/drawable/ic_emoji_recent_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/src/main/res/drawable/ic_emoji_symbols_light.xml b/libs/emojicon/src/main/res/drawable/ic_emoji_symbols_light.xml index 79aaf0fc5..9077c3289 100644 --- a/libs/emojicon/src/main/res/drawable/ic_emoji_symbols_light.xml +++ b/libs/emojicon/src/main/res/drawable/ic_emoji_symbols_light.xml @@ -1,5 +1,4 @@ - - - - - + + + diff --git a/libs/emojicon/src/main/res/drawable/orca_composer_attach_camera_button.xml b/libs/emojicon/src/main/res/drawable/orca_composer_attach_camera_button.xml index 0b255fb27..56e8d0484 100644 --- a/libs/emojicon/src/main/res/drawable/orca_composer_attach_camera_button.xml +++ b/libs/emojicon/src/main/res/drawable/orca_composer_attach_camera_button.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/libs/emojicon/src/main/res/drawable/orca_composer_attach_location_button.xml b/libs/emojicon/src/main/res/drawable/orca_composer_attach_location_button.xml index 4971113aa..be898ebcf 100644 --- a/libs/emojicon/src/main/res/drawable/orca_composer_attach_location_button.xml +++ b/libs/emojicon/src/main/res/drawable/orca_composer_attach_location_button.xml @@ -1,5 +1,4 @@ - - - - - + + + \ No newline at end of file diff --git a/libs/emojicon/src/main/res/drawable/orca_composer_attach_photo_button.xml b/libs/emojicon/src/main/res/drawable/orca_composer_attach_photo_button.xml index ca7508dd9..21f8e8e6c 100644 --- a/libs/emojicon/src/main/res/drawable/orca_composer_attach_photo_button.xml +++ b/libs/emojicon/src/main/res/drawable/orca_composer_attach_photo_button.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/libs/emojicon/src/main/res/drawable/orca_composer_popup_button.xml b/libs/emojicon/src/main/res/drawable/orca_composer_popup_button.xml index d43dc26e4..dccfb4848 100644 --- a/libs/emojicon/src/main/res/drawable/orca_composer_popup_button.xml +++ b/libs/emojicon/src/main/res/drawable/orca_composer_popup_button.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/libs/emojicon/src/main/res/drawable/orca_composer_popup_button_active.xml b/libs/emojicon/src/main/res/drawable/orca_composer_popup_button_active.xml index f5e40ef8c..556d0151b 100644 --- a/libs/emojicon/src/main/res/drawable/orca_composer_popup_button_active.xml +++ b/libs/emojicon/src/main/res/drawable/orca_composer_popup_button_active.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/libs/emojicon/src/main/res/drawable/orca_emoji_backspace_front_button.xml b/libs/emojicon/src/main/res/drawable/orca_emoji_backspace_front_button.xml index a2d2f5b62..e922eb686 100644 --- a/libs/emojicon/src/main/res/drawable/orca_emoji_backspace_front_button.xml +++ b/libs/emojicon/src/main/res/drawable/orca_emoji_backspace_front_button.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/libs/emojicon/src/main/res/drawable/orca_emoji_more_front_button.xml b/libs/emojicon/src/main/res/drawable/orca_emoji_more_front_button.xml index a799d56d9..3e0e9f6f0 100644 --- a/libs/emojicon/src/main/res/drawable/orca_emoji_more_front_button.xml +++ b/libs/emojicon/src/main/res/drawable/orca_emoji_more_front_button.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/libs/emojicon/src/main/res/drawable/orca_emoji_tab_background.xml b/libs/emojicon/src/main/res/drawable/orca_emoji_tab_background.xml index f68e6212b..d597dc03a 100644 --- a/libs/emojicon/src/main/res/drawable/orca_emoji_tab_background.xml +++ b/libs/emojicon/src/main/res/drawable/orca_emoji_tab_background.xml @@ -1,6 +1,5 @@ - + diff --git a/libs/emojicon/src/main/res/drawable/orca_emoji_tab_dark_background.xml b/libs/emojicon/src/main/res/drawable/orca_emoji_tab_dark_background.xml index 07ff608c9..f0b0d1a66 100644 --- a/libs/emojicon/src/main/res/drawable/orca_emoji_tab_dark_background.xml +++ b/libs/emojicon/src/main/res/drawable/orca_emoji_tab_dark_background.xml @@ -1,5 +1,4 @@ - - - + diff --git a/libs/emojicon/src/main/res/layout/emojicon_grid.xml b/libs/emojicon/src/main/res/layout/emojicon_grid.xml index 457f8756b..7e1579c3f 100644 --- a/libs/emojicon/src/main/res/layout/emojicon_grid.xml +++ b/libs/emojicon/src/main/res/layout/emojicon_grid.xml @@ -1,5 +1,4 @@ - - - + + + android:layout_gravity="center" + android:id="@+id/emojicon_icon" + android:layout_width="36dip" + android:layout_height="36dip" + emojicon:emojiconSize="30dip" + android:focusable="false" + android:focusableInTouchMode="false" + android:gravity="center" /> \ No newline at end of file diff --git a/libs/emojicon/src/main/res/layout/emojicons.xml b/libs/emojicon/src/main/res/layout/emojicons.xml index 287923d1b..e61c2fb34 100644 --- a/libs/emojicon/src/main/res/layout/emojicons.xml +++ b/libs/emojicon/src/main/res/layout/emojicons.xml @@ -1,5 +1,4 @@ - - + android:background="@drawable/keyboard_background_holo" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + android:id="@+id/emojis_tab" + android:layout_width="match_parent" + android:layout_height="50dip" + android:layout_alignParentTop="true" + android:orientation="horizontal"> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_0_recents" + android:src="@drawable/ic_emoji_recent_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_1_people" + android:src="@drawable/ic_emoji_people_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_2_nature" + android:src="@drawable/ic_emoji_nature_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_3_objects" + android:src="@drawable/ic_emoji_objects_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_4_cars" + android:src="@drawable/ic_emoji_places_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="center" + android:id="@+id/emojis_tab_5_punctuation" + android:src="@drawable/ic_emoji_symbols_light" /> + + android:layout_width="1px" + android:layout_height="match_parent" + android:background="#888888" /> + + android:background="@null" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:id="@+id/emojis_backspace" + android:src="@drawable/sym_keyboard_delete_holo_dark" /> + + android:layout_alignParentBottom="true" /> + + android:background="#8f8f8f" /> diff --git a/libs/emojicon/src/main/res/values/attrs.xml b/libs/emojicon/src/main/res/values/attrs.xml index 9810158dc..f4f21f903 100644 --- a/libs/emojicon/src/main/res/values/attrs.xml +++ b/libs/emojicon/src/main/res/values/attrs.xml @@ -1,5 +1,4 @@ - - - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/src/main/res/drawable/es_slidingpane_shadow.xml b/src/main/res/drawable/es_slidingpane_shadow.xml index de96e08f4..b9aaf908b 100644 --- a/src/main/res/drawable/es_slidingpane_shadow.xml +++ b/src/main/res/drawable/es_slidingpane_shadow.xml @@ -1,5 +1,5 @@ - + + android:shape="rectangle"> diff --git a/src/main/res/drawable/greybackground.xml b/src/main/res/drawable/greybackground.xml index bedc4b17a..f820cf318 100644 --- a/src/main/res/drawable/greybackground.xml +++ b/src/main/res/drawable/greybackground.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/main/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml index baf60602f..ff3ec366a 100644 --- a/src/main/res/drawable/infocard_border.xml +++ b/src/main/res/drawable/infocard_border.xml @@ -1,5 +1,5 @@ - + @@ -7,9 +7,8 @@ - - + android:color="@color/black12"> + + android:shape="rectangle"> diff --git a/src/main/res/drawable/snackbar.xml b/src/main/res/drawable/snackbar.xml index 2645b1362..a250a1bd6 100644 --- a/src/main/res/drawable/snackbar.xml +++ b/src/main/res/drawable/snackbar.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/res/drawable/switch_back_off.xml b/src/main/res/drawable/switch_back_off.xml index 20d2fb146..9082347b2 100644 --- a/src/main/res/drawable/switch_back_off.xml +++ b/src/main/res/drawable/switch_back_off.xml @@ -1,15 +1,19 @@ - + + - - + + + + - + + \ No newline at end of file diff --git a/src/main/res/drawable/switch_back_on.xml b/src/main/res/drawable/switch_back_on.xml index 45117a98e..ae78edecc 100644 --- a/src/main/res/drawable/switch_back_on.xml +++ b/src/main/res/drawable/switch_back_on.xml @@ -2,15 +2,15 @@ - - + + - - + + \ No newline at end of file diff --git a/src/main/res/drawable/switch_thumb.xml b/src/main/res/drawable/switch_thumb.xml index ba3d1c456..da33e46c3 100644 --- a/src/main/res/drawable/switch_thumb.xml +++ b/src/main/res/drawable/switch_thumb.xml @@ -1,12 +1,12 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml index 7ae1788d7..c6cc7d7c2 100644 --- a/src/main/res/layout-w945dp/fragment_conversations_overview.xml +++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml @@ -10,7 +10,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@color/grey50" - android:orientation="vertical" > + android:orientation="vertical"> - + android:orientation="vertical"> \ No newline at end of file diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml index 1143ad798..2886a4716 100644 --- a/src/main/res/layout/ab_title.xml +++ b/src/main/res/layout/ab_title.xml @@ -1,6 +1,7 @@ @@ -17,6 +18,7 @@ android:clickable="true" android:onClick="onClick" android:paddingTop="1dp" /> + + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:paddingTop="8dp"> + android:paddingRight="5dp"> + android:hint="@string/search_for_contacts_or_groups" /> \ No newline at end of file diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 47204b430..2d9f9a691 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -18,5 +18,5 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:typeface="monospace" - android:fontFamily="monospace"/> + android:fontFamily="monospace" /> diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 6fb1d0131..8808227e3 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -1,110 +1,111 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/grey200"> - - + - + - + - + - + - + - - - + + + + + - + - + - + - - + + \ No newline at end of file diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml index 248a7822c..66e416de5 100644 --- a/src/main/res/layout/activity_choose_contact.xml +++ b/src/main/res/layout/activity_choose_contact.xml @@ -2,7 +2,7 @@ + android:layout_height="match_parent"> + android:background="@color/grey200"> + android:orientation="vertical"> + android:padding="@dimen/infocard_padding"> - + android:layout_gravity="center_horizontal"> + android:padding="@dimen/infocard_padding"> + android:showDividers="middle"> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 808834d22..7747055ec 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -189,6 +189,7 @@ android:orientation="vertical" android:padding="@dimen/infocard_padding" android:visibility="gone"> + + android:textStyle="bold" /> + + android:textSize="?attr/TextSizeBody" /> + + android:textColor="@color/accent" /> + android:ellipsize="end" /> + android:ellipsize="end" /> + android:ellipsize="end" /> + android:ellipsize="end" /> + android:ellipsize="end" /> + android:ellipsize="end" /> + android:ellipsize="end" /> + android:ellipsize="end" /> + android:ellipsize="end" /> + android:textSize="?attr/TextSizeBody" /> + @@ -476,7 +481,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> + android:textSize="?attr/TextSizeBody" /> @@ -624,8 +629,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:showDividers="middle"> - + android:showDividers="middle"> @@ -647,14 +651,14 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/cancel" - android:textColor="@color/black87"/> + android:textColor="@color/black87" /> + android:background="@color/black12" /> + android:textColor="@color/black54" /> \ No newline at end of file diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_fullscreen_message.xml index 69e6f3d6a..a4d30f902 100644 --- a/src/main/res/layout/activity_fullscreen_message.xml +++ b/src/main/res/layout/activity_fullscreen_message.xml @@ -7,8 +7,7 @@ - + layout="@layout/tool_bar"> - - + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + + + + android:layout_alignParentRight="false" /> - + android:showDividers="middle"> diff --git a/src/main/res/layout/dialog_block_contact.xml b/src/main/res/layout/dialog_block_contact.xml index fd15a4665..2e43f6af8 100644 --- a/src/main/res/layout/dialog_block_contact.xml +++ b/src/main/res/layout/dialog_block_contact.xml @@ -13,7 +13,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/TextSizeBody" - android:textColor="@color/black87"/> + android:textColor="@color/black87" /> + - + android:textColor="@color/black87"> \ No newline at end of file diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml index fd553acb2..6a1a3920a 100644 --- a/src/main/res/layout/form_boolean.xml +++ b/src/main/res/layout/form_boolean.xml @@ -1,13 +1,14 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="8dp" + android:orientation="vertical"> + + android:textSize="?attr/TextSizeBody" /> \ No newline at end of file diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml index 31b521e89..398fa9bff 100644 --- a/src/main/res/layout/form_text.xml +++ b/src/main/res/layout/form_text.xml @@ -1,15 +1,16 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="8dp" + android:orientation="vertical"> + + android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" /> \ No newline at end of file diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 70ee276b7..eff7afa8f 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -19,8 +19,7 @@ android:listSelector="@android:color/transparent" android:stackFromBottom="true" android:transcriptMode="normal" - tools:listitem="@layout/message_sent"> - + tools:listitem="@layout/message_sent"> + @@ -76,7 +76,7 @@ android:layout_marginRight="8dp" android:background="@drawable/snackbar" android:minHeight="48dp" - android:visibility="gone" > + android:visibility="gone"> + android:layout_height="match_parent"> - + android:orientation="vertical"> - + android:orientation="vertical"> \ No newline at end of file diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml index 9ef2dc047..a615346fc 100644 --- a/src/main/res/layout/join_conference_dialog.xml +++ b/src/main/res/layout/join_conference_dialog.xml @@ -1,12 +1,12 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="16dp"> + android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" /> \ No newline at end of file diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml index d3271d1bc..89c47c904 100644 --- a/src/main/res/layout/keys_card.xml +++ b/src/main/res/layout/keys_card.xml @@ -1,15 +1,15 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding"> + android:textStyle="bold" /> - + android:showDividers="middle"> + android:textSize="?attr/TextSizeBody" /> \ No newline at end of file diff --git a/src/main/res/layout/list_item_tag.xml b/src/main/res/layout/list_item_tag.xml index 5042d8d16..fcb7dd984 100644 --- a/src/main/res/layout/list_item_tag.xml +++ b/src/main/res/layout/list_item_tag.xml @@ -10,5 +10,4 @@ android:textColor="@color/white" android:textAllCaps="true" android:maxLines="1" - android:layout_margin="2dp" -/> \ No newline at end of file + android:layout_margin="2dp" /> \ No newline at end of file diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml index c4adc0297..3330a7cbb 100644 --- a/src/main/res/layout/magic_create.xml +++ b/src/main/res/layout/magic_create.xml @@ -1,8 +1,9 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + + android:layout_weight="1" /> + + android:textStyle="bold" /> + + android:textSize="?attr/TextSizeBody" /> + + android:textSize="?attr/TextSizeBody" /> + + android:visibility="invisible" /> + + android:textColor="@color/accent" /> + + + android:src="@drawable/main_logo" /> \ No newline at end of file diff --git a/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml index e55d8d40a..8d7167ea6 100644 --- a/src/main/res/layout/manage_accounts.xml +++ b/src/main/res/layout/manage_accounts.xml @@ -9,7 +9,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="@color/black12" - android:dividerHeight="1dp" > - + android:dividerHeight="1dp"> \ No newline at end of file diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 5d5fb7c43..9717081a8 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -1,14 +1,14 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:emojicon="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="3dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="3dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:emojicon="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="3dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="3dp"> + + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="5dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="5dp"> + android:textColor="@color/accent" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" /> + app:riv_corner_radius="5dp" /> + android:textStyle="italic" /> \ No newline at end of file diff --git a/src/main/res/layout/password.xml b/src/main/res/layout/password.xml index 5de9baa23..db8d82505 100644 --- a/src/main/res/layout/password.xml +++ b/src/main/res/layout/password.xml @@ -1,6 +1,7 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?android:attr/activatedBackgroundIndicator" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:id="@+id/presence_template"> + - - + + + + + + android:src="?attr/icon_remove" /> \ No newline at end of file diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml index fb0b7d58f..5bbf7dad9 100644 --- a/src/main/res/layout/quickedit.xml +++ b/src/main/res/layout/quickedit.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp" > + android:padding="16dp"> + android:textColor="@color/black87"> diff --git a/src/main/res/layout/share_with.xml b/src/main/res/layout/share_with.xml index 41b6033da..162d02efe 100644 --- a/src/main/res/layout/share_with.xml +++ b/src/main/res/layout/share_with.xml @@ -2,7 +2,7 @@ + android:layout_height="match_parent"> + android:textStyle="bold" /> + + android:textSize="?attr/TextSizeInfo" /> \ No newline at end of file diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml index 8cbc1f923..c54fd7833 100644 --- a/src/main/res/layout/simple_list_item.xml +++ b/src/main/res/layout/simple_list_item.xml @@ -1,5 +1,4 @@ - - + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:gravity="center_vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:minHeight="?android:attr/listPreferredItemHeightSmall" /> diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml index e2b0798ee..e56a9fa07 100644 --- a/src/main/res/menu/attachment_choices.xml +++ b/src/main/res/menu/attachment_choices.xml @@ -1,28 +1,28 @@ - + + android:title="@string/send_location" /> + android:title="@string/attach_record_voice" /> + android:title="@string/attach_take_picture" /> + android:title="@string/attach_choose_picture" /> + android:title="@string/attach_choose_video" /> + android:title="@string/choose_file" /> \ No newline at end of file diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml index f3dfadfd0..1a320d59e 100644 --- a/src/main/res/menu/change_presence.xml +++ b/src/main/res/menu/change_presence.xml @@ -3,15 +3,15 @@ android:id="@+id/action_account_details" android:title="@string/account_details" android:showAsAction="always" - android:icon="@drawable/ic_account_box_white_24dp"/> + android:icon="@drawable/ic_account_box_white_24dp" /> + android:title="@string/action_accounts" /> + android:title="@string/action_settings" /> \ No newline at end of file diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml index 94b6479be..6c4d82153 100644 --- a/src/main/res/menu/choose_contact.xml +++ b/src/main/res/menu/choose_contact.xml @@ -6,12 +6,12 @@ android:actionLayout="@layout/actionview_search" android:icon="?attr/icon_search" android:showAsAction="collapseActionView|always" - android:title="@string/search"/> + android:title="@string/search" /> + android:visible="false" /> diff --git a/src/main/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml index fd898580a..6a6eb92d2 100644 --- a/src/main/res/menu/conference_context.xml +++ b/src/main/res/menu/conference_context.xml @@ -1,11 +1,11 @@ - + + android:title="@string/join_conference" /> + android:title="@string/delete_bookmark" /> \ No newline at end of file diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml index 223c7ece0..1940d176e 100644 --- a/src/main/res/menu/contact_context.xml +++ b/src/main/res/menu/contact_context.xml @@ -1,17 +1,17 @@ - + + android:title="@string/start_conversation" /> + android:title="@string/view_contact_details" /> + android:title="@string/block_contact" /> + android:title="@string/delete_contact" /> \ No newline at end of file diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index 7fba3a4bd..328b46098 100644 --- a/src/main/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml @@ -1,38 +1,38 @@ - + + android:title="@string/action_edit_contact" /> + android:title="@string/share_uri_with" /> + android:title="@string/action_delete_contact" /> + android:title="@string/action_block_contact" /> + android:title="@string/action_unblock_contact" /> \ No newline at end of file diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index 4f0b98a34..22d8a513a 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -1,78 +1,78 @@ - + + android:title="@string/action_add" /> + android:title="@string/action_secure" /> - + android:title="@string/attach_file" /> + + android:title="@string/invite_contact" /> + android:title="@string/action_clear_history" /> + android:title="@string/action_end_conversation" /> + android:title="@string/action_end_conversation_muc" /> + android:title="@string/disable_notifications" /> + android:title="@string/enable_notifications" /> + android:title="@string/mgmt_account_edit" /> + android:title="@string/action_settings" /> + android:title="@string/action_check_update" /> \ No newline at end of file diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 5aa2fc04e..fa53c08de 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -4,59 +4,59 @@ android:id="@+id/action_change_presence" android:showAsAction="always" android:title="@string/change_presence" - android:icon="@drawable/ic_new_releases_white_24dp"/> + android:icon="@drawable/ic_new_releases_white_24dp" /> + android:title="@string/show_qr_code" /> + android:title="@string/show_block_list" /> + android:visible="false" /> + android:title="@string/server_info_show_more" /> + android:title="@string/mam_prefs" /> + android:title="@string/show_password" /> + android:title="@string/change_password" /> + android:title="@string/mgmt_account_reconnect" /> + android:title="@string/clear_other_devices" /> + android:title="@string/action_settings" /> \ No newline at end of file diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml index ab42a206b..89b6761ce 100644 --- a/src/main/res/menu/encryption_choices.xml +++ b/src/main/res/menu/encryption_choices.xml @@ -1,19 +1,19 @@ - + - + + android:title="@string/encryption_choice_unencrypted" /> + android:title="@string/encryption_choice_omemo" /> + android:title="@string/encryption_choice_otr" /> + android:title="@string/encryption_choice_pgp" /> \ No newline at end of file diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 2ce422a7b..38b82010b 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -1,21 +1,21 @@ - - - + + + \ No newline at end of file diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml index 1205b3291..beca7b8ec 100644 --- a/src/main/res/menu/manageaccounts_context.xml +++ b/src/main/res/menu/manageaccounts_context.xml @@ -1,21 +1,21 @@ - + + android:title="@string/change_presence" /> + android:title="@string/mgmt_account_publish_avatar" /> + android:title="@string/mgmt_account_publish_pgp" /> + android:title="@string/mgmt_account_reconnect" /> + android:title="@string/mgmt_account_delete" /> \ No newline at end of file diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 7f95d712a..0c3220683 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -1,48 +1,48 @@ - + + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> \ No newline at end of file diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 5ee463de5..cf0d6c3b8 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -6,30 +6,30 @@ android:icon="?attr/icon_edit" android:orderInCategory="10" android:showAsAction="always" - android:title="@string/action_edit_subject"/> + android:title="@string/action_edit_subject" /> + android:title="@string/share_uri_with" /> + android:title="@string/save_as_bookmark" /> + android:title="@string/delete_bookmark" /> + android:title="@string/advanced_mode" /> \ No newline at end of file diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml index edbb2264a..4760cec44 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -1,44 +1,44 @@ - + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> + android:visible="false" /> diff --git a/src/main/res/menu/omemo_key_context.xml b/src/main/res/menu/omemo_key_context.xml index 2e2fc5dac..f63a3439b 100644 --- a/src/main/res/menu/omemo_key_context.xml +++ b/src/main/res/menu/omemo_key_context.xml @@ -2,8 +2,8 @@ + android:title="@string/purge_key" /> + android:title="@string/copy_fingerprint" /> \ No newline at end of file diff --git a/src/main/res/menu/publish_avatar.xml b/src/main/res/menu/publish_avatar.xml index 1bffb2961..39478c0a4 100644 --- a/src/main/res/menu/publish_avatar.xml +++ b/src/main/res/menu/publish_avatar.xml @@ -4,5 +4,5 @@ android:id="@+id/action_crop_image" android:showAsAction="always" android:icon="@drawable/ic_crop_white_24dp" - android:title="@string/select_image_and_crop"/> + android:title="@string/select_image_and_crop" /> \ No newline at end of file diff --git a/src/main/res/menu/select_multiple.xml b/src/main/res/menu/select_multiple.xml index 4240849fd..efd6e4d0a 100644 --- a/src/main/res/menu/select_multiple.xml +++ b/src/main/res/menu/select_multiple.xml @@ -1,5 +1,5 @@ - + - + + android:title="@string/action_add" /> \ No newline at end of file diff --git a/src/main/res/menu/showlocation.xml b/src/main/res/menu/showlocation.xml index 227b9970f..3eb0647c9 100644 --- a/src/main/res/menu/showlocation.xml +++ b/src/main/res/menu/showlocation.xml @@ -4,5 +4,5 @@ android:id="@+id/action_navigate" android:showAsAction="always" android:title="@string/navigate" - android:icon="@drawable/ic_navigation_white_24dp"/> + android:icon="@drawable/ic_navigation_white_24dp" /> \ No newline at end of file diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index 305ffd223..27e9fc29b 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -20,10 +20,10 @@ + android:title="@string/join_conference" /> + android:title="@string/create_conference" /> @@ -38,6 +38,6 @@ android:checked="false" android:orderInCategory="85" android:showAsAction="never" - android:title="@string/hide_offline"/> + android:title="@string/hide_offline" /> \ No newline at end of file diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml index e833ba79d..57d45dcde 100644 --- a/src/main/res/menu/verification_choices.xml +++ b/src/main/res/menu/verification_choices.xml @@ -3,10 +3,10 @@ + android:title="@string/scan_qr_code" /> + android:title="@string/ask_question" /> - + - 63dp - 12dp + 63dp + 12dp \ No newline at end of file diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index b6bd918c5..4c126478e 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -1,99 +1,99 @@ - - Mobile - Phone - Tablet - @string/app_name - Android - - - @string/never - 256 KiB - 512 KiB - 1 MiB - 5 MiB - 10 MiB - - - 1 - 262144 - 524288 - 1048576 - 5242880 - 10485760 - - - @string/thirty_minutes - @string/one_hour - @string/two_hours - @string/eight_hours - @string/until_further_notice - + + Mobile + Phone + Tablet + @string/app_name + Android + + + @string/never + 256 KiB + 512 KiB + 1 MiB + 5 MiB + 10 MiB + + + 1 + 262144 + 524288 + 1048576 + 5242880 + 10485760 + + + @string/thirty_minutes + @string/one_hour + @string/two_hours + @string/eight_hours + @string/until_further_notice + - - 1800 - 3600 - 7200 - 28800 - -1 - + + 1800 + 3600 + 7200 + 28800 + -1 + - - @string/none - @string/recently_used - @string/attach_take_picture - @string/attach_choose_picture - @string/attach_record_voice - @string/send_location - + + @string/none + @string/recently_used + @string/attach_take_picture + @string/attach_choose_picture + @string/attach_record_voice + @string/send_location + - - none - recent - photo - picture - voice - location - + + none + recent + photo + picture + voice + location + - - never - auto - always - + + never + auto + always + - - @string/never - @string/automatically - @string/always - + + @string/never + @string/automatically + @string/always + - - never - auto - always - + + never + auto + always + - - @string/never - @string/automatically - @string/always - + + @string/never + @string/automatically + @string/always + - - @string/never - @string/contacts - @string/always - + + @string/never + @string/contacts + @string/always + - - @string/presence_chat - @string/presence_online - @string/presence_away - @string/presence_xa - @string/presence_dnd - + + @string/presence_chat + @string/presence_online + @string/presence_away + @string/presence_xa + @string/presence_dnd + diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 526ab66be..309c1fb30 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -5,34 +5,34 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + \ No newline at end of file diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 4a7f235d9..a613cefb9 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,19 +1,19 @@ - #ff259b24 - #ff2e4272 - #ff08183e - #ff000309 - #ff2e4272 - #de000309 - #8a000309 + #ff259b24 + #ff2e4272 + #ff08183e + #ff000309 + #ff2e4272 + #de000309 + #8a000309 #1f000000 - #ffe2e7f1 - #b2e2e7f1 - #fafafa - #ffeeeeee - #ff9e9e9e - #ff424242 + #ffe2e7f1 + #b2e2e7f1 + #fafafa + #ffeeeeee + #ff9e9e9e + #ff424242 #ffc62828 - #ffff9800 + #ffff9800 diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index da216ef21..9ef329aa8 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -1,8 +1,8 @@ - - 8dp - 8dp - 16dp + + 8dp + 8dp + 16dp 8dp - 64dp + 64dp diff --git a/src/main/res/values/ids.xml b/src/main/res/values/ids.xml index 84f9ac69e..78ccb5596 100644 --- a/src/main/res/values/ids.xml +++ b/src/main/res/values/ids.xml @@ -4,6 +4,6 @@ - - + + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3bd18cfbf..21a09479c 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,280 +1,280 @@  - Pix-Art Messenger - Settings - New conversation - Manage accounts - End this conversation - Contact details - Secure conversation - Add account - Edit name - Add to address book - Delete from roster - Block contact - Unblock contact - Block domain - Unblock domain - Manage Accounts - Settings - Conference Details - Contact Details - Share with Conversation - Start Conversation - Choose contact - Block list - just now - 1 min ago - %d mins ago - unread Conversations - sending… - Decrypting message. Please wait… - OpenPGP encrypted message - Nickname is already in use - Admin - Owner - Moderator - Participant - Visitor - Would you like to remove %s from your roster? The conversation associated with this contact will not be removed. - Would you like to block %s from sending you messages? - Would you like to unblock %s and allow them to send you messages? - Block all contacts from %s? - Unblock all contacts from %s? - Contact blocked - Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed. - Register new account on server - Change password on server - Share with… - Start Conversation - Invite Contact - Contacts - Cancel - Set - Add - Edit - Delete - Block - Unblock - Save - OK - Pix-Art Messenger has crashed - By sending in stack traces you are helping the ongoing development of Pix-Art Messenger\nWarning: This will use your XMPP account to send the stack trace to the developer. - Send now - Never ask again - Unable to connect to account - Unable to connect to multiple accounts - Touch here to manage your accounts - Attach file - The contact is not in your roster. Would you like to add it? - Add contact - delivery failed - Preparing image for transmission - Preparing images for transmission - Sharing files. Please wait… - Clear history - Clear Conversation History - Do you want to delete all messages within this Conversation?\n\nWarning: This will not influence messages stored on other devices or servers. - Delete messages - End this conversation afterwards - Choose device - Send unencrypted message - Send message to %s - Send OTR encrypted message - Send OMEMO encrypted message - Send v\\OMEMO encrypted message - Send OpenPGP encrypted message - Your nickname has been changed - Send unencrypted - Decryption failed. Maybe you don’t have the proper private key. - OpenKeychain - Pix-Art Messenger utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Pix-Art Messenger afterwards.) - Restart - Install - Please install OpenKeychain - offering… - waiting… - No OpenPGP Key found - Pix-Art Messenger is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP. - No OpenPGP Keys found - General - XMPP resource - The name this client identifies itself with - Accept files in WiFi connections - When connected to wifi automatically accept files smaller than… - Accept files in mobile connections - When connected with mobile data automatically accept files smaller than… - Accept files in mobile roaming connections - When connected with mobile data in roaming automatically accept files smaller than… - Attachments - Notification - Notifications - Notify when a new message arrives - Vibrate - Vibrate when a new message arrives - LED Notification - Blink notification light when a new message arrives - Ringtone - Play sound when a new message arrives - Send crash reports - By sending in stack traces you are helping the ongoing development of Pix-Art Messenger - Confirm Messages - Let your contact know when you have received and read a message - UI - OpenKeychain reported an error - Accept - An error has occurred - Grant presence updates - Preemptively grant and ask for presence subscription for contacts you created - Your account - Send presence updates - Receive presence updates - Ask for presence updates - Choose picture - Take picture - Preemptively grant subscription request - The file you selected is not an image - Error while converting the image file - File not found - General I/O error. Maybe you ran out of storage space? - The app you used to select this image did not provide us with enough permissions to read the file.\n\nUse a different file manager to choose an image - Unknown - Temporarily disabled - Online - Connecting\u2026 - Offline - Unauthorized - Server not found - No connectivity - Registration failed - Username already in use - Registration completed - Server does not support registration - Security error - Policy violation - Incompatible server - Stream error - Unencrypted - OTR - OpenPGP - OMEMO - Edit account - Delete account - Publish avatar - Publish OpenPGP public key - OpenPGP public key has been published. - Remember to republish your OpenPGP public keys! - Are you sure? - If you delete your account your entire conversation history will be lost - Record voice - Jabber ID - Password - username@pix-art.de - Confirm password - Password - Confirm password - Passwords do not match - This is not a valid Jabber ID - Out of memory. Image is too large - Do you want to add %s to your address book? - Server info - XEP-0313: MAM - XEP-0280: Message Carbons - XEP-0352: Client State Indication - XEP-0191: Blocking Command - XEP-0237: Roster Versioning - XEP-0198: Stream Management - XEP-0163: PEP (Avatars / OMEMO) - XEP-0363: HTTP File Upload - XEP-0357: Push - available - unavailable - Missing public key announcements - online - 1 minute ago - %d minutes ago - 1 hour ago - %d hours ago - 1 day ago - %d days ago - Encrypted message. Please install OpenKeychain to decrypt. - Unknown OTR fingerprint - OpenPGP encrypted messages found - Your fingerprint - OTR fingerprint - OTR fingerprint of message - OpenPGP Key ID - OMEMO fingerprint - v\\OMEMO fingerprint - OMEMO fingerprint of message - v\\OMEMO fingerprint of message - Own OMEMO fingerprint - Other devices - Trust OMEMO Fingerprints - Fetching keys… - Done - Verify - Decrypt - Conferences - Search - Create Contact - Enter Contact - Join Conference - Delete Contact - View contact details - Block contact - Unblock contact - Create - Select - The contact already exists - Join - Conference address - conference@room.pix-art.de - Save as bookmark - Delete bookmark - This bookmark already exists - Edit conference subject - The subject of this conference - Joining conference… - Leave - Contact added you to contact list - Add back - %s has read up to this point - Publish - Touch avatar to select picture from gallery - Please note: Everyone subscribed to your presence updates will be allowed to see this picture. - Publishing… - The server rejected your publication - Something went wrong while converting your picture - Could not save avatar to disk - (Or long press to bring back default) - Your server does not support the publication of avatars - whispered - to %s - Send private message to %s - Connect - This account already exists - Next - Current session established - Skip - Disable notifications - Enable - Conference requires password - Enter password - Please request presence updates from your contact first.\n\nThis will be used to determine what client(s) your contact is using. - Request now - Delete Fingerprint - Are you sure you would like to delete this fingerprint? - Ignore - Warning: Sending this without mutual presence updates could cause unexpected problems.\n\nGo to contact details to verify your presence subscriptions. - Security and data protection - Allow message correction - Allow your contacts to retroactively edit their messages - Don’t save encrypted messages - Warning: This could lead to message loss - Expert settings - About Pix-Art Messenger - Build and licensing information + Pix-Art Messenger + Settings + New conversation + Manage accounts + End this conversation + Contact details + Secure conversation + Add account + Edit name + Add to address book + Delete from roster + Block contact + Unblock contact + Block domain + Unblock domain + Manage Accounts + Settings + Conference Details + Contact Details + Share with Conversation + Start Conversation + Choose contact + Block list + just now + 1 min ago + %d mins ago + unread Conversations + sending… + Decrypting message. Please wait… + OpenPGP encrypted message + Nickname is already in use + Admin + Owner + Moderator + Participant + Visitor + Would you like to remove %s from your roster? The conversation associated with this contact will not be removed. + Would you like to block %s from sending you messages? + Would you like to unblock %s and allow them to send you messages? + Block all contacts from %s? + Unblock all contacts from %s? + Contact blocked + Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed. + Register new account on server + Change password on server + Share with… + Start Conversation + Invite Contact + Contacts + Cancel + Set + Add + Edit + Delete + Block + Unblock + Save + OK + Pix-Art Messenger has crashed + By sending in stack traces you are helping the ongoing development of Pix-Art Messenger\nWarning: This will use your XMPP account to send the stack trace to the developer. + Send now + Never ask again + Unable to connect to account + Unable to connect to multiple accounts + Touch here to manage your accounts + Attach file + The contact is not in your roster. Would you like to add it? + Add contact + delivery failed + Preparing image for transmission + Preparing images for transmission + Sharing files. Please wait… + Clear history + Clear Conversation History + Do you want to delete all messages within this Conversation?\n\nWarning: This will not influence messages stored on other devices or servers. + Delete messages + End this conversation afterwards + Choose device + Send unencrypted message + Send message to %s + Send OTR encrypted message + Send OMEMO encrypted message + Send v\\OMEMO encrypted message + Send OpenPGP encrypted message + Your nickname has been changed + Send unencrypted + Decryption failed. Maybe you don’t have the proper private key. + OpenKeychain + Pix-Art Messenger utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Pix-Art Messenger afterwards.) + Restart + Install + Please install OpenKeychain + offering… + waiting… + No OpenPGP Key found + Pix-Art Messenger is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP. + No OpenPGP Keys found + General + XMPP resource + The name this client identifies itself with + Accept files in WiFi connections + When connected to wifi automatically accept files smaller than… + Accept files in mobile connections + When connected with mobile data automatically accept files smaller than… + Accept files in mobile roaming connections + When connected with mobile data in roaming automatically accept files smaller than… + Attachments + Notification + Notifications + Notify when a new message arrives + Vibrate + Vibrate when a new message arrives + LED Notification + Blink notification light when a new message arrives + Ringtone + Play sound when a new message arrives + Send crash reports + By sending in stack traces you are helping the ongoing development of Pix-Art Messenger + Confirm Messages + Let your contact know when you have received and read a message + UI + OpenKeychain reported an error + Accept + An error has occurred + Grant presence updates + Preemptively grant and ask for presence subscription for contacts you created + Your account + Send presence updates + Receive presence updates + Ask for presence updates + Choose picture + Take picture + Preemptively grant subscription request + The file you selected is not an image + Error while converting the image file + File not found + General I/O error. Maybe you ran out of storage space? + The app you used to select this image did not provide us with enough permissions to read the file.\n\nUse a different file manager to choose an image + Unknown + Temporarily disabled + Online + Connecting\u2026 + Offline + Unauthorized + Server not found + No connectivity + Registration failed + Username already in use + Registration completed + Server does not support registration + Security error + Policy violation + Incompatible server + Stream error + Unencrypted + OTR + OpenPGP + OMEMO + Edit account + Delete account + Publish avatar + Publish OpenPGP public key + OpenPGP public key has been published. + Remember to republish your OpenPGP public keys! + Are you sure? + If you delete your account your entire conversation history will be lost + Record voice + Jabber ID + Password + username@pix-art.de + Confirm password + Password + Confirm password + Passwords do not match + This is not a valid Jabber ID + Out of memory. Image is too large + Do you want to add %s to your address book? + Server info + XEP-0313: MAM + XEP-0280: Message Carbons + XEP-0352: Client State Indication + XEP-0191: Blocking Command + XEP-0237: Roster Versioning + XEP-0198: Stream Management + XEP-0163: PEP (Avatars / OMEMO) + XEP-0363: HTTP File Upload + XEP-0357: Push + available + unavailable + Missing public key announcements + online + 1 minute ago + %d minutes ago + 1 hour ago + %d hours ago + 1 day ago + %d days ago + Encrypted message. Please install OpenKeychain to decrypt. + Unknown OTR fingerprint + OpenPGP encrypted messages found + Your fingerprint + OTR fingerprint + OTR fingerprint of message + OpenPGP Key ID + OMEMO fingerprint + v\\OMEMO fingerprint + OMEMO fingerprint of message + v\\OMEMO fingerprint of message + Own OMEMO fingerprint + Other devices + Trust OMEMO Fingerprints + Fetching keys… + Done + Verify + Decrypt + Conferences + Search + Create Contact + Enter Contact + Join Conference + Delete Contact + View contact details + Block contact + Unblock contact + Create + Select + The contact already exists + Join + Conference address + conference@room.pix-art.de + Save as bookmark + Delete bookmark + This bookmark already exists + Edit conference subject + The subject of this conference + Joining conference… + Leave + Contact added you to contact list + Add back + %s has read up to this point + Publish + Touch avatar to select picture from gallery + Please note: Everyone subscribed to your presence updates will be allowed to see this picture. + Publishing… + The server rejected your publication + Something went wrong while converting your picture + Could not save avatar to disk + (Or long press to bring back default) + Your server does not support the publication of avatars + whispered + to %s + Send private message to %s + Connect + This account already exists + Next + Current session established + Skip + Disable notifications + Enable + Conference requires password + Enter password + Please request presence updates from your contact first.\n\nThis will be used to determine what client(s) your contact is using. + Request now + Delete Fingerprint + Are you sure you would like to delete this fingerprint? + Ignore + Warning: Sending this without mutual presence updates could cause unexpected problems.\n\nGo to contact details to verify your presence subscriptions. + Security and data protection + Allow message correction + Allow your contacts to retroactively edit their messages + Don’t save encrypted messages + Warning: This could lead to message loss + Expert settings + About Pix-Art Messenger + Build and licensing information Pix-Art Messenger \n\nCopyright © 2014-2016 Christian Schneppe \n\nhttp://jabber.pix-art.de @@ -318,397 +318,397 @@ \n\nhttps://github.com/blazsolar/FlowLayout\n(Apache License, Version 2.0) \n\nhttps://github.com/ankushsachdeva/emojicon\n(Apache License, Version 2.0) - Quiet Hours - Start time - End time - Enable quiet hours - Notifications will be silenced during quiet hours - Increase font size - Use larger font sizes across the entire app - Send button indicates status - Request message receipts - Received messages will be marked with a green tick if supported - Colorize send button to indicate contact status - Other - Automatically join conferences - Respect the autojoin flag in conference bookmarks - OTR fingerprint copied to clipboard! - OMEMO fingerprint copied to clipboard! - You are banned from this conference - This conference is members only - You have been kicked from this conference - The conference was shut down - using account %s - Checking %s on HTTP host - You are not connected. Try again later - Check %s size - Check %1$s size on %2$s - Message options - Copy text - Copy original URL - Send again - File URL - Message text - URL copied to clipboard - Message copied to clipboard - Scan QR code - Show QR code - Show block list - Account details - Verify OTR - Remote Fingerprint - Hint or Question - Shared Secret - Confirm - In progress - Respond - Failed - Secrets do not match - Try again - Finish - Verified! - Contact requested SMP verification - No valid OTR session has been found! - Pix-Art Messenger - Export Logs - Write logs to SD card - Writing backup to SD card - Choose file - Receiving %1$s (%2$d%% completed) - Download %s - Delete %s - file - Open %s - sending (%1$d%% completed) - Preparing file for transmission - %s offered for download - Cancel transmission - file transmission failed - The file has been deleted - No application found to open file - Could not verify fingerprint - Manually verify - Are you sure that you want to verify your contacts OTR fingerprint? - Show dynamic tags - Display read-only tags underneath contacts - Enable notifications - No conference server found - Conference creation failed!s - Account avatar - Copy OTR fingerprint to clipboard - Copy OMEMO fingerprint to clipboard - Regenerate OMEMO key - Clear devices - Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. - Purge key - Are you sure you want to purge this key? - It will irreversibly be considered compromised, and you can never build a session with it again. - There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contacts server. - There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones. - Error - Fetching history from server - No more history on server - Updating… - Password changed! - Could not change password - Send a message to start an encrypted chat - Ask question - If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other’s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer. - Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret. - Your hint should not be empty - Your shared secret can not be empty - Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those. - Change password - Current password - New password - Password should not be empty - Perform action with - No affiliation - Offline - Outcast - Member - Advanced mode - Grant membership - Revoke membership - Grant admin privileges - Revoke admin privileges - Remove from conference - Could not change affiliation of %s - Ban from conference - You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever. - Ban now - Could not change role of %s - Publicly accessible conference - Private, members only conference - Conference options - Private, members only - Non-anonymous - Moderated - You are not participating - Modified conference options! - Could not modify conference options - Never - 30 minutes - 1 hour - 2 hours - 8 hours - Until further notice - Input - Enter is send - Use enter key to send message - Show enter key - Change the emoticons key to an enter key - audio - video - image - PDF document - Android App - Contact - Received %s - Disable foreground service - Touch to open Pix-Art Messenger - Avatar has been published! - Sending %s - Offering %s - Hide offline - is typing… - Typing notifications - Let your contact know when you are writing a new message - Send location - Show location - No application found to display location - Location - Received location - Conversation closed - Left conference - Don’t trust system CAs - All certificates must be manually approved - Remove certificates - Delete manually approved certificates - No manually approved certificates - Remove certificates - Delete selection - Cancel - - %d certificate deleted - %d certificates deleted - - - Select %d contact - Select %d contacts - - Replace send button with quick action - Quick Action - None - Most recently used - Choose quick action - Search for contacts or groups - Send private message - %s has left the conference! - Username - Username - This is not a valid username - Download failed: Server not found - Download failed: File not found - Download failed: Could not connect to host - undo - Download failed: Could not write file - Use white background - Show received messages as black text on a white background - Check for Updates - Update Service - Version %1$s is available.\n\nFilesize: %2$s\n\nUpdate to version %1$s now?\n\n\n%4$s - Checking for Pix-Art Messenger updates - later - update - No update available - Download started - Tor network unavailable - Bind failure - Server not responsible for domain - Broken - Presence - Away when screen is off - Marks your resource as away when the screen is turned off - Not available in silent mode - Pix-Art Messenger is checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.\n\nPlease wait… - Marks your resource as not available when device is in silent mode - Treat vibrate as silent mode - Marks your resource as not available when device is on vibrate - xmpp.pix-art.de - Add account with certificate - Unable to parse certificate - Leave empty to authenticate w/ certificate - Archiving preferences - Server-side archiving preferences - Fetching archiving preferences. Please wait… - Unable to fetch archiving preferences - Captcha required - Enter the text from the image above - Certificate chain is not trusted - Jabber ID does not match certificate - Renew certificate - Error fetching OMEMO key! - Verified OMEMO key with certificate! - Your device does not support the selection of client certificates! - Changes - Hostname - Port - Server- or .onion-Address - This is not a valid port number - This is not a valid hostname - %1$d of %2$d accounts connected - - %d message - %d messages - - Load more messages - Shared file with %s - Shared image with %s - Pix-Art Messenger needs access to external storage - Shared images with %s - Shared text with %s - Synchronize with contacts - Pix-Art Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nPix-Art Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts. - Certificate Information - Subject - Issuer - Common Name - Organization - SHA-1 - (Not available) - No certificate found - Notify on all messages - Notify only when highlighted - Notifications disabled - Notifications paused - Compress Pictures - Resize and compress pictures - Compress Videos - Resize and compress Videos - Always - Automatically - Battery optimizations enabled - Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\nIt is recommended to disable those. - Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. - Disable - The selected area is too large - Cancel update check? - Yes - No - (No activated accounts) - This field is required - No participants - Correct message - Send corrected message - You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference. - Select image and crop - Pix-Art Messenger is unable to encrypt your messages because your contacts are not announcing their public keys.\n\n - You have disabled this account - Security error: Invalid file access - No application found to share URI - Share URI with… - reconnect - Pix-Art Messenger - …is a free and secure XMPP/Jabber client for the use with pix-art.de - We will guide you through the process of creating an account on pix-art.de with a random password, which you can use or change to your own password on the next page. \nThan you will be able to communicate with users of this and other providers by giving them your full Jabber-ID. - Your Jabber-ID will be: %s - Create new account - Use an existing account - Choose your username - Manually change presence - Change your presence inside your account - Change Presence - Status message - Set for all accounts on this device - Free for Chat - Online - Away - Not Available - Busy - A secure password has been generated - Your device does not support opting out of battery optimization - Share - Share location - Location sharing is disabled in settings - Locating… - We have integrated the VoiceRecorder and ShareLocation plugin directly into the messenger. You should uninstall the plugins. - Uninstall - Leave conference - Do you really want to leave this conference? You will no longer be notified of new messages until joining the conference again. - Show password - Registration failed: Try again later - Registration failed: Password too weak - Create conference - Join or create conference - Subject - Choose participants - Creating conference… - There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? - Import backup - Invite again - has invited you via - Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over... - Broadcast Last User Interaction - Let all your contacts know when use Pix-Art Messenger - Invite to Pix-Art Messenger - Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself. - You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself. - Unable to connect to OpenKeychain - Pix-Art Messenger has no permissions - Send image? - This device is no longer in use - Computer - Mobile phone - Tablet - Web browser - Console - Import canceled - Database import failed, an import is not possible - Wrong password, try again - Please enter your account password to import your backup. - Please wait… - Backup will be imported, this may take awhile. - Enable an export of chat logs as human readable text files - Export human readable chat logs - Payment required - Missing internet permission - Me - Contact asks for presence subscription - Allow - Choose video - Prepare video for transmission. Please wait… - Compressing video, please wait… - Shared video with %s - No permission to access %s - Remote server not found - This file seems to be corrupt. - Unable to update account - Missing presence subscription with %s. - Missing OMEMO keys from %s. - This is not a private, non-anonymous conference. - There are no members in this conference. - Report this JID as sending unwanted messages. - Report an issue - Delete OMEMO identities - Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort. - Delete selected keys - Missing presence subscription - Missing OMEMO keys - You need to be connected to publish your avatar. - Select text - Show error message - Error Message - Data saver enabled - Your operating system is restricting Pix-Art Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Pix-Art Messenger unrestricted access when Data saver is on.\\nPix-Art Messenger will still make an effort to save data when possible. - Your device does not supporting disabling Data saver for Pix-Art Messenger. - Navigate to location - Add to contact list - Received contact - Contact - Unable to start recording - Unable to create temporary file - This device has been verified - Copy fingerprint - All OMEMO keys have been verified]]> + Quiet Hours + Start time + End time + Enable quiet hours + Notifications will be silenced during quiet hours + Increase font size + Use larger font sizes across the entire app + Send button indicates status + Request message receipts + Received messages will be marked with a green tick if supported + Colorize send button to indicate contact status + Other + Automatically join conferences + Respect the autojoin flag in conference bookmarks + OTR fingerprint copied to clipboard! + OMEMO fingerprint copied to clipboard! + You are banned from this conference + This conference is members only + You have been kicked from this conference + The conference was shut down + using account %s + Checking %s on HTTP host + You are not connected. Try again later + Check %s size + Check %1$s size on %2$s + Message options + Copy text + Copy original URL + Send again + File URL + Message text + URL copied to clipboard + Message copied to clipboard + Scan QR code + Show QR code + Show block list + Account details + Verify OTR + Remote Fingerprint + Hint or Question + Shared Secret + Confirm + In progress + Respond + Failed + Secrets do not match + Try again + Finish + Verified! + Contact requested SMP verification + No valid OTR session has been found! + Pix-Art Messenger + Export Logs + Write logs to SD card + Writing backup to SD card + Choose file + Receiving %1$s (%2$d%% completed) + Download %s + Delete %s + file + Open %s + sending (%1$d%% completed) + Preparing file for transmission + %s offered for download + Cancel transmission + file transmission failed + The file has been deleted + No application found to open file + Could not verify fingerprint + Manually verify + Are you sure that you want to verify your contacts OTR fingerprint? + Show dynamic tags + Display read-only tags underneath contacts + Enable notifications + No conference server found + Conference creation failed!s + Account avatar + Copy OTR fingerprint to clipboard + Copy OMEMO fingerprint to clipboard + Regenerate OMEMO key + Clear devices + Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. + Purge key + Are you sure you want to purge this key? + It will irreversibly be considered compromised, and you can never build a session with it again. + There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contacts server. + There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones. + Error + Fetching history from server + No more history on server + Updating… + Password changed! + Could not change password + Send a message to start an encrypted chat + Ask question + If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other’s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer. + Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret. + Your hint should not be empty + Your shared secret can not be empty + Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those. + Change password + Current password + New password + Password should not be empty + Perform action with + No affiliation + Offline + Outcast + Member + Advanced mode + Grant membership + Revoke membership + Grant admin privileges + Revoke admin privileges + Remove from conference + Could not change affiliation of %s + Ban from conference + You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever. + Ban now + Could not change role of %s + Publicly accessible conference + Private, members only conference + Conference options + Private, members only + Non-anonymous + Moderated + You are not participating + Modified conference options! + Could not modify conference options + Never + 30 minutes + 1 hour + 2 hours + 8 hours + Until further notice + Input + Enter is send + Use enter key to send message + Show enter key + Change the emoticons key to an enter key + audio + video + image + PDF document + Android App + Contact + Received %s + Disable foreground service + Touch to open Pix-Art Messenger + Avatar has been published! + Sending %s + Offering %s + Hide offline + is typing… + Typing notifications + Let your contact know when you are writing a new message + Send location + Show location + No application found to display location + Location + Received location + Conversation closed + Left conference + Don’t trust system CAs + All certificates must be manually approved + Remove certificates + Delete manually approved certificates + No manually approved certificates + Remove certificates + Delete selection + Cancel + + %d certificate deleted + %d certificates deleted + + + Select %d contact + Select %d contacts + + Replace send button with quick action + Quick Action + None + Most recently used + Choose quick action + Search for contacts or groups + Send private message + %s has left the conference! + Username + Username + This is not a valid username + Download failed: Server not found + Download failed: File not found + Download failed: Could not connect to host + undo + Download failed: Could not write file + Use white background + Show received messages as black text on a white background + Check for Updates + Update Service + Version %1$s is available.\n\nFilesize: %2$s\n\nUpdate to version %1$s now?\n\n\n%4$s + Checking for Pix-Art Messenger updates + later + update + No update available + Download started + Tor network unavailable + Bind failure + Server not responsible for domain + Broken + Presence + Away when screen is off + Marks your resource as away when the screen is turned off + Not available in silent mode + Pix-Art Messenger is checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.\n\nPlease wait… + Marks your resource as not available when device is in silent mode + Treat vibrate as silent mode + Marks your resource as not available when device is on vibrate + xmpp.pix-art.de + Add account with certificate + Unable to parse certificate + Leave empty to authenticate w/ certificate + Archiving preferences + Server-side archiving preferences + Fetching archiving preferences. Please wait… + Unable to fetch archiving preferences + Captcha required + Enter the text from the image above + Certificate chain is not trusted + Jabber ID does not match certificate + Renew certificate + Error fetching OMEMO key! + Verified OMEMO key with certificate! + Your device does not support the selection of client certificates! + Changes + Hostname + Port + Server- or .onion-Address + This is not a valid port number + This is not a valid hostname + %1$d of %2$d accounts connected + + %d message + %d messages + + Load more messages + Shared file with %s + Shared image with %s + Pix-Art Messenger needs access to external storage + Shared images with %s + Shared text with %s + Synchronize with contacts + Pix-Art Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nPix-Art Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts. + Certificate Information + Subject + Issuer + Common Name + Organization + SHA-1 + (Not available) + No certificate found + Notify on all messages + Notify only when highlighted + Notifications disabled + Notifications paused + Compress Pictures + Resize and compress pictures + Compress Videos + Resize and compress Videos + Always + Automatically + Battery optimizations enabled + Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\nIt is recommended to disable those. + Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those. + Disable + The selected area is too large + Cancel update check? + Yes + No + (No activated accounts) + This field is required + No participants + Correct message + Send corrected message + You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference. + Select image and crop + Pix-Art Messenger is unable to encrypt your messages because your contacts are not announcing their public keys.\n\n + You have disabled this account + Security error: Invalid file access + No application found to share URI + Share URI with… + reconnect + Pix-Art Messenger + …is a free and secure XMPP/Jabber client for the use with pix-art.de + We will guide you through the process of creating an account on pix-art.de with a random password, which you can use or change to your own password on the next page. \nThan you will be able to communicate with users of this and other providers by giving them your full Jabber-ID. + Your Jabber-ID will be: %s + Create new account + Use an existing account + Choose your username + Manually change presence + Change your presence inside your account + Change Presence + Status message + Set for all accounts on this device + Free for Chat + Online + Away + Not Available + Busy + A secure password has been generated + Your device does not support opting out of battery optimization + Share + Share location + Location sharing is disabled in settings + Locating… + We have integrated the VoiceRecorder and ShareLocation plugin directly into the messenger. You should uninstall the plugins. + Uninstall + Leave conference + Do you really want to leave this conference? You will no longer be notified of new messages until joining the conference again. + Show password + Registration failed: Try again later + Registration failed: Password too weak + Create conference + Join or create conference + Subject + Choose participants + Creating conference… + There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? + Import backup + Invite again + has invited you via + Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over... + Broadcast Last User Interaction + Let all your contacts know when use Pix-Art Messenger + Invite to Pix-Art Messenger + Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself. + You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself. + Unable to connect to OpenKeychain + Pix-Art Messenger has no permissions + Send image? + This device is no longer in use + Computer + Mobile phone + Tablet + Web browser + Console + Import canceled + Database import failed, an import is not possible + Wrong password, try again + Please enter your account password to import your backup. + Please wait… + Backup will be imported, this may take awhile. + Enable an export of chat logs as human readable text files + Export human readable chat logs + Payment required + Missing internet permission + Me + Contact asks for presence subscription + Allow + Choose video + Prepare video for transmission. Please wait… + Compressing video, please wait… + Shared video with %s + No permission to access %s + Remote server not found + This file seems to be corrupt. + Unable to update account + Missing presence subscription with %s. + Missing OMEMO keys from %s. + This is not a private, non-anonymous conference. + There are no members in this conference. + Report this JID as sending unwanted messages. + Report an issue + Delete OMEMO identities + Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort. + Delete selected keys + Missing presence subscription + Missing OMEMO keys + You need to be connected to publish your avatar. + Select text + Show error message + Error Message + Data saver enabled + Your operating system is restricting Pix-Art Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Pix-Art Messenger unrestricted access when Data saver is on.\\nPix-Art Messenger will still make an effort to save data when possible. + Your device does not supporting disabling Data saver for Pix-Art Messenger. + Navigate to location + Add to contact list + Received contact + Contact + Unable to start recording + Unable to create temporary file + This device has been verified + Copy fingerprint + All OMEMO keys have been verified]]> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 9837b8588..071d26d3c 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -32,7 +32,7 @@ @drawable/ic_settings_grey600_24dp @drawable/ic_import_export_white_24dp @drawable/ic_share_white_24dp - + 16dp 16dp @@ -52,12 +52,15 @@ +