Merge branch 'development' into linked-identities

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java

...

This commit is contained in:

Vincent Breitmoser

2015-03-05 12:10:51 +01:00

parent 98ce06dbc9 8c8fdd6c49

commit 7b3bc4ca98

598 changed files with 1240 additions and 1508 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 641 B After Width:  |  Height:  |  Size: 669 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 679 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 450 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_collection.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 422 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_copy.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 381 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 454 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 398 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_edit.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 884 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 524 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 651 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_help.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 497 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 497 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 556 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 373 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 458 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 573 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_play.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 497 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 398 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 702 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 394 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 507 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_settings.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 953 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 647 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 356 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 805 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 309 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_close_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 329 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 416 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 726 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 287 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_content_paste_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 325 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 248 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_done_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 326 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 276 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_file_upload_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 262 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_folder_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 227 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 381 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 588 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_import_export_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 300 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_key_plus_grey600_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 642 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_lock_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 409 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 408 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 351 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_person_add_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 394 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 381 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 301 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_save_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 344 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 341 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_search_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 522 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_select_all_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 314 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_settings_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 572 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_share_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 513 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_view_list_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 209 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_warning_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 443 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.2 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.5 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.7 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 743 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 675 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 806 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 748 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 736 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 675 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 906 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 789 B

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96dp.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 485 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 444 B

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96dp.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 962 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 861 B

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96dp.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 3.6 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 742 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 740 B

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96dp.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 925 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 813 B

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96dp.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 772 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 695 B

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96dp.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 506 B After Width:  |  Height:  |  Size: 499 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 513 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 335 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_collection.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 336 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_copy.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 288 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 333 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 324 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_edit.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 587 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 480 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 406 B

Some files were not shown because too many files have changed in this diff Show More