TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-18 08:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for updated fingerprint format

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2016-08-24 18:51:45 -07:00
parent 0619a4d3cd
commit 852634b294
33 changed files with 806 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/attrs.xml
View File

@@ -129,6 +129,8 @@
<attr name="recipient_preference_blocked" format="color"/>
<attr name="verification_background" format="color"/>
<declare-styleable name="ColorPreference">
<attr name="itemLayout" format="reference" />
<attr name="choices" format="reference" />

22
res/values/strings.xml
View File

@@ -554,16 +554,10 @@
<string name="ThreadRecord_disappearing_message_time_updated_to_s">Disappearing message time set to %s</string>
<!-- VerifyIdentityActivity -->
<string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">You do not have an identity key.</string>
<string name="VerifyIdentityActivity_recipient_has_no_identity_key">Recipient has no identity key.</string>
<string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Recipient has no identity key!</string>
<string name="VerifyIdentityActivity_scan_contacts_qr_code">Scan contact\'s QR code</string>
<string name="VerifyIdentityActivity_display_your_qr_code">Display your QR code</string>
<string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">WARNING, the scanned key DOES NOT match! Please check the fingerprint text carefully.</string>
<string name="VerifyIdentityActivity_not_verified_exclamation">NOT Verified!</string>
<string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Their key is correct. It is also necessary to verify your key with them as well.</string>
<string name="VerifyIdentityActivity_verified_exclamation">Verified!</string>
<string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">You don\'t have an identity key!</string>
<string name="VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal">Your contact is running an old version of Signal, please ask them to update before verifying security numbers.</string>
<string name="VerifyIdentityActivity_you_re_attempting_to_verify_security_numbers_with">You\'re attempting to verify security numbers with %1$s, but scanned %2$s instead.</string>
<string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_security_number">The scanned QR code is not a correctly formatted security number verification code. Please try scanning again.</string>
<!-- ViewIdentityActivity -->
<string name="ViewIdentityActivity_you_do_not_have_an_identity_key">You do not have an identity key.</string>
@@ -935,10 +929,10 @@
<string name="recipients_panel__to"><small>Enter a name or number</small></string>
<string name="recipients_panel__add_member">Add member</string>
<!-- verify_identity_activity -->
<string name="verify_identity_activity__their_identity_they_read">Their identity (they read):</string>
<string name="verify_identity_activity__your_identity_you_read">Your identity (you read):</string>
<!-- verify_display_fragment -->
<string name="verify_display_fragment__scan_the_code_on_your_contact_s_phone_or_ask_them_to_scan_your_code_to_verify_that_your_messages_are_end_to_end_encrypted_you_can_alternately_compare_the_number_above">Scan the code on your contact\'s phone, or ask them to scan your code, to verify that your messages are end-to-end encrypted. You can alternately compare the number above.</string>
<string name="verify_display_fragment__tap_to_scan">Tap to scan</string>
<!-- message_details_header -->
<string name="message_details_header__issues_need_your_attention">Some issues need your attention.</string>
<string name="message_details_header__sent">Sent</string>

5
res/values/styles.xml
View File

@@ -227,5 +227,10 @@
<item name="android:textOff">@null</item>
</style>
<style name="IdentityKey">
<item name="android:fontFamily">monospace</item>
<item name="android:typeface">monospace</item>
<item name="android:textSize">17sp</item>
</style>
</resources>

4
res/values/themes.xml
View File

@@ -127,6 +127,8 @@
<item name="conversation_number_picker_text_color_normal">@color/gray65</item>
<item name="conversation_number_picker_text_color_selected">@color/black</item>
<item name="verification_background">@color/gray5</item>
<item name="emoji_tab_strip_background">@color/gray12</item>
<item name="emoji_tab_indicator">#66555555</item>
<item name="emoji_tab_underline">#44555555</item>
@@ -235,6 +237,8 @@
<item name="conversation_item_received_text_secondary_color">#BFffffff</item>
<item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
<item name="verification_background">#ff333333</item>
<item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
<item name="dialog_alert_icon">@drawable/ic_warning_dark</item>