Commit Graph

2283 Commits

Author SHA1 Message Date
Adithya Abraham Philip 6f496730be removed unnecessary @TargetApi annotation 2015-03-17 02:32:09 +05:30
Dominik Schürmann 025eaf0757 Disable hidden recipients for now 2015-03-16 20:34:27 +01:00
Dominik Schürmann fd8f5ebb2f Allow for hidden recipients in encrypt methods 2015-03-16 18:20:44 +01:00
Dominik Schürmann a5271bf229 Allow encrypt of filenames via overflow menu 2015-03-16 17:00:53 +01:00
Dominik Schürmann 146fa8d6c0 Clarify certification help screen 2015-03-16 15:05:39 +01:00
Dominik Schürmann a655664c0b object oriented split user id 2015-03-16 13:54:01 +01:00
Dominik Schürmann 58450daef4 Fix nullpointer when scanning malformed qr codes 2015-03-16 00:16:20 +01:00
Dominik Schürmann ad9c35f522 Allow selection of none in SelectSignKeyIdActivity 2015-03-15 22:05:12 +01:00
Dominik Schürmann 5cb22ece30 Clarify MIME usage 2015-03-15 21:17:24 +01:00
Dominik Schürmann d824ec3bc9 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-15 19:35:12 +01:00
Dominik Schürmann 75368034bd Put API activites in normal process to allow hydrate/dehydrate of logs 2015-03-15 19:35:03 +01:00
Vincent Breitmoser db39b779c9 fix expiry of master keys
fixes #1141
2015-03-15 19:20:03 +01:00
Dominik Schürmann 809cd6e495 Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist 2015-03-15 18:58:09 +01:00
Dominik Schürmann fd5719ff6b Remove display of key id in other lists 2015-03-15 18:40:52 +01:00
Dominik Schürmann 81d6da899f Show main user id instead of key in certify screen 2015-03-15 16:32:52 +01:00
Dominik Schürmann e873bac880 Fixes for selection of certify key 2015-03-15 16:24:06 +01:00
Dominik Schürmann ff60e80d42 Merge pull request #1142 from tdjogi010/development
Preselected Suitable Key
2015-03-15 15:56:12 +01:00
Dominik Schürmann 8a2bd80d40 Merge pull request #1148 from manojkhannakm/development
Fixed a ClassCastException
2015-03-15 15:35:32 +01:00
Dominik Schürmann f1dc58ddfd Merge pull request #1147 from Hiperzone/development
-fixed out of bounds crash when retrieving the main profile name with se...
2015-03-15 15:34:07 +01:00
Dominik Schürmann f4cb254404 Dont display key ids in KeySpinner, display creation date when user ids duplicate 2015-03-15 15:29:06 +01:00
Manoj Khanna 0fe060e88e Fixed a ClassCastException 2015-03-15 12:30:08 +05:30
Dominik Schürmann c2593f29ff Query for duplicate user ids 2015-03-15 02:40:31 +01:00
Daniel Ramos d3dd9020f5 -fixed out of bounds crash when retrieving the main profile name with secret keys
-fixed a possible crash when retrieving the main profile contactid
2015-03-15 00:12:26 +00:00
Dominik Schürmann 6c9b2ce0c0 Add missing license headers 2015-03-15 00:49:29 +01:00
Dominik Schürmann 8ede97b9ff Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-14 21:36:35 +01:00
Dominik Schürmann f1b1ecae20 Merge pull request #1143 from manojkhannakm/development
Fix for Issue #1115
2015-03-14 21:36:28 +01:00
Dominik Schürmann afa7790fbd disable debug sync 2015-03-14 14:08:03 +01:00
Dominik Schürmann 12734127a7 Use names also for main contact 2015-03-14 14:07:45 +01:00
Dominik Schürmann cd7f631221 Show key name instead of key id in contacts, cleanup 2015-03-14 14:05:31 +01:00
tdjogi010@gmail.com d56c90ce76 Preselected Suitable Key 2015-03-13 11:06:13 +05:30
Adithya Abraham Philip d7ef2c1b9e added some documentation 2015-03-13 04:49:34 +05:30
Adithya Abraham Philip 759009ddb4 added own profile support in linekd system contact 2015-03-13 04:04:11 +05:30
Adithya Abraham Philip d4375b7dfc links own keys to me profile in contacts 2015-03-13 03:13:22 +05:30
Manoj Khanna 5b5e5b4981 Fix for Issue #1115 2015-03-13 00:53:05 +05:30
Dominik Schürmann b953623802 Clarify logs in DeleteFileDialog 2015-03-12 14:34:58 +01:00
Dominik Schürmann 27027b8ee5 Use notify instead of Toast for NFC check 2015-03-12 13:39:20 +01:00
Dominik Schürmann 67a9f12790 Merge pull request #1133 from Rrego6/development
Check if NFC is available on device
2015-03-12 13:38:15 +01:00
Dominik Schürmann 183457334f Merge pull request #1117 from danielnelz/development
#1042: Replaced ints with enums
2015-03-12 13:27:04 +01:00
Dominik Schürmann dae48e84c8 Improve file deletion strings 2015-03-12 13:18:31 +01:00
Dominik Schürmann 4de978bccb Merge pull request #1137 from manojkhannakm/development
Updated fix for Issue #1116
2015-03-12 13:11:29 +01:00
Dominik Schürmann fb1701f09f Merge pull request #1134 from adithyaphilip/sync-confirmed-keys
Sync only confirmed keys and change
2015-03-12 13:08:18 +01:00
danielnelz 52200edfd7 Fixed possible ArrayIndexOutOfBoundsException. 2015-03-11 21:32:20 +01:00
Adithya Abraham Philip 08972de68f added contact sync at end of CertifyOperation 2015-03-11 23:11:01 +05:30
Adithya Abraham Philip 45eea9b5b8 corrected linked system contact display name 2015-03-11 23:10:32 +05:30
Vincent Breitmoser 9ff4d7b2bc change user_id primary key in database, use keyring rather than unified query in consolidate 2015-03-11 18:39:26 +01:00
Manoj Khanna bb018b8fc1 Updated fix for Issue #1116 2015-03-11 20:52:00 +05:30
Dominik Schürmann 82a2a76a33 make constant for certify hash algo 2015-03-11 14:37:23 +01:00
Raoul 471f92a967 Check if NFC is available on device 2015-03-10 22:06:17 -04:00
Dominik Schürmann 4ed1bf0ca4 Version 3.2beta2 2015-03-10 16:30:00 +01:00
Dominik Schürmann 58d066a54e Pull from transifex 2015-03-10 16:19:46 +01:00
Dominik Schürmann 446e16fc62 Disable maybe methods in ImportKeysListEntry for now 2015-03-10 15:55:19 +01:00
Dominik Schürmann 79a4e7fb9c Fix expiry, revoked checks in OpenPgpSignatureResultBuilder 2015-03-10 15:52:44 +01:00
Dominik Schürmann 0e32b37f9d Changelog 3.2beta1 2015-03-10 15:35:47 +01:00
Dominik Schürmann 7346144ba9 Remove unused NFC Beam html 2015-03-10 15:18:24 +01:00
Dominik Schürmann f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Dominik Schürmann b3257e0ffa Ripple 2015-03-10 02:13:36 +01:00
Dominik Schürmann 64e85a2eb4 Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card
Conflicts:
	Graphics/get-material-icons.sh
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
	OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
2015-03-10 01:51:30 +01:00
Dominik Schürmann b74fa6c662 Merge pull request #1121 from adithyaphilip/rawcontact-deletion
Fixed contact deletion Issue #1120
2015-03-10 01:45:28 +01:00
Dominik Schürmann bce0fe6221 Add additional email addresses in create key 2015-03-10 01:44:07 +01:00
Dominik Schürmann 3012001979 Show passphrase checkbox in create key 2015-03-10 03:46:10 +05:30
Adithya Abraham Philip 224f243c79 added CALLER_IS_SYNCADAPTER parameter to delete queries 2015-03-10 03:28:12 +05:30
Adithya Abraham Philip 5f0a468d9a changed default drawable for linked system contact 2015-03-10 02:49:34 +05:30
Dominik Schürmann 7d2e2e3eec Make create key wizard step-by-step 2015-03-10 02:49:34 +05:30
Dominik Schürmann e3547b4979 Show passphrase checkbox in create key 2015-03-09 22:09:48 +01:00
Dominik Schürmann 67076b2019 Make create key wizard step-by-step 2015-03-09 22:00:44 +01:00
Adithya Abraham Philip 012b7e4830 cleaned up code, added comments
optimised imports
2015-03-10 01:33:55 +05:30
Adithya Abraham Philip f8a6f814dd added contact linking 2015-03-10 01:08:09 +05:30
Adithya Abraham Philip bc43797c32 added card 2015-03-10 01:08:09 +05:30
danielnelz 704821a8db Merge remote-tracking branch 'upstream/development' into development 2015-03-09 20:25:03 +01:00
danielnelz 7d27faf00c Added braces to if else. 2015-03-09 20:14:11 +01:00
danielnelz 17301be2ca Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType
in KeychainIntentService and replaced int constants with them. Fixed some
typos.
2015-03-09 20:09:05 +01:00
Dominik Schürmann cc66435e38 Some fixes for delete after encryption 2015-03-09 18:59:15 +01:00
Dominik Schürmann 7c22fc843b Fix ascii armor in encrypt activity 2015-03-09 18:33:20 +01:00
Dominik Schürmann 009e8e9e39 Fix compression check in activities 2015-03-09 18:21:54 +01:00
Dominik Schürmann 3fe7fa202c API: If signature key is known return pi to show key 2015-03-09 17:12:46 +01:00
Dominik Schürmann b2e5ac2820 Fix colors for remote activity 2015-03-09 16:55:23 +01:00
Dominik Schürmann bd1705410a Cleanup new widgets 2015-03-09 16:17:12 +01:00
Dominik Schürmann d8c4867825 Merge pull request #1112 from chipset95/issue-1106-imp
Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
2015-03-09 16:08:45 +01:00
Dominik Schürmann 72c18734ad Redesign of encrypt activites finished 2015-03-09 16:03:58 +01:00
chipset95 c55353e2b8 Implemented NameEditText 2015-03-09 18:12:44 +05:30
Dominik Schürmann c50dceab32 Improve icons 2015-03-09 13:27:24 +01:00
chipset95 e2c502a511 Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 2015-03-09 17:55:46 +05:30
Dominik Schürmann cf2aa34970 Fix padding in create key 2015-03-09 13:18:21 +01:00
Dominik Schürmann 9572327c36 Removed unused PasswordEditText 2015-03-09 12:59:35 +01:00
Dominik Schürmann 80f2822dd8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-09 12:52:17 +01:00
Dominik Schürmann 7ac4f63ea3 Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator
Passphrase strength indicator
2015-03-09 12:51:00 +01:00
Adithya Abraham Philip 820005bc37 minor xml code style correction 2015-03-08 12:57:37 +05:30
Vincent Breitmoser 30ca8637ff add support for certification of user attributes 2015-03-08 01:46:30 +01:00
Adithya Abraham Philip f181a1ecbe minor code style correction 2015-03-07 13:07:28 +05:30
Adithya Abraham Philip 976c40e45f removed created by comment 2015-03-06 22:42:37 +05:30
Adithya Abraham Philip 1de528fc85 cleaned up code 2015-03-06 22:25:35 +05:30
Adithya Abraham Philip f12f6b540d changed default colors for PasswordStrengthView 2015-03-06 22:11:33 +05:30
Adithya Abraham Philip fee891fc06 added PassphraseEditText to SetPassphraseDialogFragment 2015-03-06 22:00:30 +05:30
Adithya Abraham Philip c5093433f5 added PassphraseEditText 2015-03-06 21:32:17 +05:30
Dominik Schürmann 4013a36276 Remove dublicate email check 2015-03-06 11:20:45 +01:00
Dominik Schürmann def4492107 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-06 11:16:06 +01:00
Dominik Schürmann a03f6d35d6 Improve way of getting possible names by filtering out emails 2015-03-06 11:14:27 +01:00
Vincent 443feef27a Merge pull request #1108 from tdjogi010/development
Asks Passphrase for key delete/export in ViewKeyActivity.
2015-03-06 11:10:42 +01:00
Dominik Schürmann f31ada30d0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-06 10:50:31 +01:00
chipset95 7c2fefe2f7 Added GPLv3 License 2015-03-06 14:47:11 +05:30
tdjogi010@gmail.com 61b306a74a Asks Passphrase for key delete/export in ViewKeyActivity. 2015-03-06 11:50:41 +05:30
chipset95 d83219f3a0 Created EmailEditText, PasswordEditText and implemented wherever required 2015-03-06 11:13:56 +05:30
Dominik Schürmann d74a662614 Tryout design for encrypt, decrypt 2015-03-06 01:52:06 +01:00
Dominik Schürmann eaf7e5e005 Fix elevation 2015-03-06 01:12:33 +01:00
Dominik Schürmann 0bb3b9c6cc Format code of merged password strength widget 2015-03-05 23:39:41 +01:00
Dominik Schürmann 23b8e8272c Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
2015-03-05 23:29:43 +01:00
Dominik Schürmann e50eda4e29 Use ArrayList instead of LinkedList 2015-03-05 17:59:53 +01:00
Dominik Schürmann 02084ba14a Cleanup of PgpConstants 2015-03-05 17:53:14 +01:00
Dominik Schürmann afbb166de6 Add missing header 2015-03-05 17:52:12 +01:00
Dominik Schürmann 3bc3e3e6f4 Check for insecure hash and symmetric encryption algos on decrypt 2015-03-05 17:46:43 +01:00
Dominik Schürmann aeb0169f02 Use static linked lists instead of arrays 2015-03-05 17:24:56 +01:00
Dominik Schürmann 0300bce41f Add missing file with PGP Constants 2015-03-05 16:58:15 +01:00
Dominik Schürmann e45f000cb4 Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists 2015-03-05 16:57:57 +01:00
Dominik Schürmann 8b7684baf7 Remove preferences multi process min sdk check 2015-03-05 15:12:59 +01:00
Dominik Schürmann 1576a76ecc Remove false comment in list fragment 2015-03-05 12:53:51 +01:00
Dominik Schürmann 7ccdd7d38e Debug options 2015-03-05 11:14:19 +01:00
Dominik Schürmann 18a827eeed Design fixes for decryption screen 2015-03-05 11:06:17 +01:00
Dominik Schürmann c0aabbeb3c Use no compression in API for now 2015-03-05 10:56:27 +01:00
Dominik Schürmann c121657c2c Better selection of preferred algorithm 2015-03-05 10:49:57 +01:00
Dominik Schürmann 8c8fdd6c49 Merge pull request #1101 from danielnelz/development
#1042 replaced some int constants with enums
2015-03-04 22:05:55 +01:00
Dominik Schürmann 0706bca8c6 Rewording secret_key_deletion_confirmation 2015-03-04 21:14:37 +01:00
Dominik Schürmann f3af54c814 Show fingerprint menu item only if not revoked or expired 2015-03-04 21:12:52 +01:00
Daniel Nelz fe8b08ac84 #1042 replaced some int constants with enums
Created enum FragAction in CreateKeyActivity.java and enum State in
KeyFormattingUtils.java and replaced int constants with them
2015-03-04 21:07:32 +01:00
Dominik Schürmann 7c8f338297 Use material save icon 2015-03-04 20:57:11 +01:00
Dominik Schürmann bb2d80bfc8 Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
2015-03-04 20:54:11 +01:00
Dominik Schürmann e312b0e675 Set key signature algo from SHA512 to SHA256 2015-03-04 20:47:37 +01:00
Dominik Schürmann 484a9371b7 Remove help button for now 2015-03-04 20:40:55 +01:00
Dominik Schürmann 2bfe355d44 More icon naming fixes and design 2015-03-04 20:03:20 +01:00
Dominik Schürmann de31fcc45f Partially fix file names 2015-03-04 19:04:15 +01:00
Dominik Schürmann 17a627919c Simplified language: Confirm keys 2015-03-04 18:34:42 +01:00
Dominik Schürmann fcc819d437 Update lib list 2015-03-04 15:52:06 +01:00
Dominik Schürmann b662ff6c49 Get high res version of contact photo 2015-03-04 15:39:41 +01:00
Dominik Schürmann 502a0b5376 Crop image view to center 2015-03-04 15:26:09 +01:00
Dominik Schürmann 2389ce9aeb Full height contact pic in key view 2015-03-04 15:23:33 +01:00
Dominik Schürmann 46944198e4 ContactHelper cleanup 2015-03-04 15:12:00 +01:00
Dominik Schürmann ff42dfc9db Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED instead of EXPIRY where possible 2015-03-04 15:02:51 +01:00
Dominik Schürmann b10fe01b82 Fix status bar orange 2015-03-04 11:46:31 +01:00
Dominik Schürmann 9b565f1875 More simplification of delete strings 2015-03-04 11:44:37 +01:00
Dominik Schürmann 8e12e93bc0 Merge pull request #1097 from ishan1604/orange-toolbar
Orange toolbar for certify and fingerprint activity added
2015-03-04 11:40:37 +01:00
Dominik Schürmann 71db34ed75 Simplify certify strings 2015-03-04 11:40:12 +01:00
Dominik Schürmann aba6569dd2 Simplify dialogs according to Material Design 2015-03-04 11:36:26 +01:00
Ishan Khanna 0362dc6c1d Orange Toolbar Added Fixes #1088 2015-03-04 15:47:44 +05:30
Vincent c17599f13f Merge pull request #1080 from indrora/avoid-large-log-parcels
Fix root cause of #1077
2015-03-04 00:43:48 +01:00
Dominik Schürmann 1cc860d23f Merge branch 'development' of https://github.com/vectorijk/open-keychain into vectorijk-development 2015-03-03 23:46:20 +01:00
Adithya Abraham Philip 024ba19499 corrected code style 2015-03-04 04:14:28 +05:30
Dominik Schürmann c00a1f1ec3 Show name only in passphrase dialog 2015-03-03 23:43:25 +01:00
Lukas Zorich 438314c4bb Integrates passphrase strength indicator to create key wizard.
This commit patches issue #1050. The padding set in the passphrase edit
text is set programmatically because there is a bug in appcompat-v7
where padding via xml doesn't work:

http://code.google.com/p/android/issues/detail?id=77982
2015-03-03 18:52:10 -03:00
Lukas Zorich 7f9c663033 Add license to password strength view classes 2015-03-03 18:51:06 -03:00
Dominik Schürmann 7b0e067f63 Fix expiry dialog, reorder layouts 2015-03-03 22:44:32 +01:00
Dominik Schürmann 188559bbcd Prettify passphrase dialog, it no longer resizes on unlocking the key 2015-03-03 22:27:14 +01:00
Ishan Khanna eedc7064b9 Fixes Issue#1088 2015-03-04 02:36:33 +05:30
jiangkai f195055107 icon name changes in UI files 2015-03-03 12:19:00 -08:00
jiangkai f186199017 delete holo icons 2015-03-03 12:17:11 -08:00
jiangkai 6c0a5c04e7 change icon name in layout files 2015-03-03 11:26:59 -08:00
Lukas Zorich 2443bc9f5d Implemented Matt Allen password strength indicator
I used most of Matt Allen password strength indicator code available
here https://github.com/matt-allen/android-password-strength-indicator,
but modified it a little bit in order to customize the view's colors
through the xml.
2015-03-03 16:23:43 -03:00
Dominik Schürmann 5a4fc0a071 Fix toolbar margins on Android lower 5 2015-03-03 20:15:09 +01:00
jiangkai ba1cd87d39 download new material design icons 2015-03-03 10:36:38 -08:00
Dominik Schürmann be06c4cd58 Use spinner DatePicker, not full calendar, also on Android 5 2015-03-03 19:04:40 +01:00
Morgan Gangwere ba5eb3543e Cleanup for style
Some nitpicks were had. Also, change the null UUID to a constant.
2015-03-03 08:47:16 -07:00
Dominik Schürmann 5da57f0582 Update patternview lib, remove workaround 2015-03-03 15:56:03 +01:00
Dominik Schürmann 2ea0f609f2 Remove old min sdk check 2015-03-03 13:16:56 +01:00
Dominik Schürmann 199ff610e0 Merge pull request #1082 from ishan1604/bug-1081
Fixes Issue #1081
2015-03-03 11:21:28 +01:00
Ishan Khanna 06d76ccd0c Fixes Issue #1081
The App crashed because the Adapter was trying to call a method on a
null object.

Where was the null object?
CheckBox was null because in the Layout file
view_key_adv_user_id_item.xml

There is no such widget with id = user_id_item_check_box

Fix :
I removed the two lines which were causing the bug, and now the screen
loads perfectly.
2015-03-03 14:46:28 +05:30
Morgan Gangwere 73a1ceb732 Fix root cause of #1077
When importing lots of keys, lots of messages about the status of keys
is generated, including some debug slime and general fluff that
isn't really needed a lot of the time. As a result, a serious bug can come
along after key imports or certain operations which cause a log to become
parceled.

This commit implements a pool to "dehydrate" logs into: they are placed
into the pool (a ConcurrentHashMap) and a UUID assigned to them, which
is parceled along. When the OperationResult is un-parceled, it reads in
the appropriate UUID bits and rehydrates the appropriate log.

In order to avoid any memory leaks, the log pool removes a reference to
the log itself, allowing the log to die a natural death at the hands
of the GC..
2015-03-03 00:51:44 -07:00
Dominik Schürmann d3f54d3ace Revert "rescale qr code bitmap in background"
size of view may not be available in background thread.

This reverts commit 7e4c39c79d.
2015-03-03 00:26:36 +01:00
Dominik Schürmann 363d41ed1d Cleanup of contact sync, debugging 2015-03-03 00:26:15 +01:00
Dominik Schürmann ea24b5169e Reorder build.gradle 2015-03-02 18:50:38 +01:00
Vincent Breitmoser 7e4c39c79d rescale qr code bitmap in background 2015-03-02 18:44:24 +01:00
Vincent Breitmoser 145e793db1 forgot to rename a method 2015-03-02 18:20:02 +01:00
Vincent Breitmoser 23464e7a89 some cleanup in ViewKey* 2015-03-02 18:09:00 +01:00
Adithya Abraham Philip c2c8ee1efd Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-03-02 22:31:13 +05:30
Vincent Breitmoser 817afffecc Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-02 17:44:50 +01:00
Vincent Breitmoser 1f828528d3 don't reload qr code for identical fingerprint 2015-03-02 17:43:42 +01:00
Dominik Schürmann dae0873f5e Search string simplified 2015-03-02 17:39:30 +01:00
Vincent Breitmoser 0846dd2c14 make userattributeadapter superclass of useridsadapter 2015-03-02 17:38:05 +01:00
Dominik Schürmann 3c7c278ef3 Use gradle witness 2015-03-02 17:23:06 +01:00
Dominik Schürmann 9514719719 Re-add black color 2015-03-02 16:29:40 +01:00
Dominik Schürmann 84e5ac4b03 Remove supertoast dependency 2015-03-02 16:25:12 +01:00
Dominik Schürmann 505140ef2a Use SDK and build tools versions from root project 2015-03-02 16:21:51 +01:00
Dominik Schürmann 69865a6d57 Use index constants in ContactHelper 2015-03-02 15:44:34 +01:00
Adithya Abraham Philip e69ee812d2 supports sub logs in log export 2015-03-01 11:31:46 +05:30
Adithya Abraham Philip 95e9e2ac30 added logging, notify for log export 2015-03-01 02:02:39 +05:30
Vincent Breitmoser 4e29d027af fix a couple lint errors 2015-02-28 17:49:09 +01:00
Adithya Abraham Philip 6a26ea908e Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 21:57:49 +05:30
Vincent Breitmoser 0557e0680e some changes to qr scan logic 2015-02-28 15:58:26 +01:00
Adithya Abraham Philip 94114e35c2 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 14:29:20 +05:30
Vincent Breitmoser 2ae4d6ce05 pass through messenger to certify service from ViewKeyActivity
the idea here is to handle progress and result of the CertifyActivity
directly in ViewKeyActivity by passing a messenger through to it. this
allows smoother transition from an uncertified to certified state.
2015-02-28 04:34:08 +01:00
Vincent Breitmoser f3710b12f6 fab support for all notify types 2015-02-28 02:30:59 +01:00
Vincent Breitmoser e4d91de8d2 small Notify cleanup 2015-02-28 01:37:57 +01:00
Vincent Breitmoser 6ba03c0f13 clean up warnings in KeyListFragment 2015-02-28 01:32:15 +01:00
Vincent Breitmoser cc5b0dae06 collapse fab on action selected
closes #1057
2015-02-28 01:31:24 +01:00
Vincent Breitmoser d64b8f47d1 animate FAB to move up and down when a snackbar appears 2015-02-28 01:17:53 +01:00
Dominik Schürmann c8f5dc5cf3 Strings: File size 2015-02-28 00:56:04 +01:00
Dominik Schürmann cec7cb3620 Fix strings based on transifex reports 2015-02-28 00:51:58 +01:00
Vincent Breitmoser 67093ccba2 forgot to commit FabContainer 2015-02-28 00:40:11 +01:00
Dominik Schürmann fd55cdb08e Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
2015-02-28 00:39:18 +01:00
Dominik Schürmann 453b67f7a8 Update from transifex 2015-02-28 00:38:53 +01:00
Vincent Breitmoser 9c62c3fd39 control flow for moving the fab up with snackbar 2015-02-28 00:28:20 +01:00
Dominik Schürmann 0669193e75 Simplify MainActivity 2015-02-28 00:22:31 +01:00
Dominik Schürmann 1c91be84af Upload new keys to keyserver by default 2015-02-28 00:11:34 +01:00
Dominik Schürmann 0b49becaa8 padding fixes for key list 2015-02-28 00:04:15 +01:00
Dominik Schürmann dc38031b4e Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:57:00 +01:00
Dominik Schürmann 582caaba97 Reorder advanced key view 2015-02-27 23:56:53 +01:00
Vincent Breitmoser c46fdef203 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:53:14 +01:00
Vincent Breitmoser 8cfba4c0fb slightly longer color fade duration 2015-02-27 23:52:51 +01:00
Dominik Schürmann f2a9a41840 Enable multi line snackbar option 2015-02-27 23:47:15 +01:00
Dominik Schürmann 200d4a6bb6 Remove swipte to refresh src, fix padding in key list 2015-02-27 23:39:36 +01:00
Dominik Schürmann b1c8fa3471 Fix keyboard overlay bug on top of edittexts 2015-02-27 23:24:04 +01:00
Vincent Breitmoser aec9bdfc1e transition status color in key view 2015-02-27 23:10:02 +01:00
Vincent Breitmoser 863f4e6ac1 hand through result in CertifyFingerprintActivity 2015-02-27 23:09:17 +01:00
Dominik Schürmann 5b1d834f91 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 22:47:43 +01:00
Dominik Schürmann fd2f858b12 Fix status images in user id adapter 2015-02-27 22:47:39 +01:00
Vincent Breitmoser 80c159056d show refresh key progress inline 2015-02-27 22:46:48 +01:00
Dominik Schürmann fe31883f66 Keybase header text 2015-02-27 22:40:52 +01:00
Dominik Schürmann 54e04f496e Better qr code resizing 2015-02-27 22:26:11 +01:00
Adithya Abraham Philip 23cbd786ea cleaned up log export 2015-02-28 02:11:39 +05:30
Adithya Abraham Philip 960a163185 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 01:30:41 +05:30
Adithya Abraham Philip d776bd2888 refined log output 2015-02-28 01:30:17 +05:30
Vincent Breitmoser 2cd7be6373 go to directly to certify screen after nfc import 2015-02-27 18:05:36 +01:00
Dominik Schürmann ea4ca9e686 Prettify qr code cleanup 2015-02-27 01:47:06 +01:00
Dominik Schürmann 11c3436454 Prettify qr code in advanced key view 2015-02-27 01:44:40 +01:00
Dominik Schürmann 4ccd9f9bb1 Uncluttering advanced key view 2015-02-27 01:38:57 +01:00
Dominik Schürmann b90335f901 Simplify delete key dialog 2015-02-27 01:30:32 +01:00
Dominik Schürmann 8230fb1179 Remove unused BadImportKeyDialogFragment 2015-02-27 01:26:26 +01:00
Dominik Schürmann 6bd4e1e5b3 Fix margins of dialog views 2015-02-27 01:26:04 +01:00
Dominik Schürmann 6dce7c88d8 Merge keybase-proof branch 2015-02-27 01:18:18 +01:00
Vincent Breitmoser 4ff8eca292 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-26 18:54:00 +01:00
Vincent Breitmoser 55dd6526a6 split up and mark unsafe expiry-related methods 2015-02-26 18:53:42 +01:00
Vincent Breitmoser e5bb7a35b5 save revocation instead of self-cert for revoked uids 2015-02-26 18:53:16 +01:00
Vincent Breitmoser d7888d4666 ignore revoked user ids for primary key expiry 2015-02-26 18:52:54 +01:00
Adithya Abraham Philip 99ff9d2340 merged dialog 2015-02-26 22:26:40 +05:30
Dominik Schürmann 1210a80a96 Remove old Holo design resources 2015-02-26 17:37:28 +01:00
Dominik Schürmann 93109985e7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-26 17:32:28 +01:00
Dominik Schürmann 4c4782bd5e Hopefully fixes drop down icon for spinners on Android lower 5 2015-02-26 17:32:08 +01:00
Adithya Abraham Philip ec353b0c39 initial Log Display function 2015-02-26 21:58:25 +05:30
Vincent Breitmoser ad8209bd94 pre-select certification key if only one is available 2015-02-26 10:48:17 +01:00
Dominik Schürmann 72acaaa41f Fingerprint verification, design fixes for qr code card 2015-02-26 02:06:57 +01:00
Dominik Schürmann a38f84a401 Dont show verification icons in my key view, hide edit button for non-secret keys 2015-02-25 21:53:46 +01:00
Dominik Schürmann b521162ef0 Invoke NFC button 2015-02-25 20:50:34 +01:00
Dominik Schürmann 0931c7742b Other icon for key exchange 2015-02-25 20:20:39 +01:00
Dominik Schürmann 57fa702cbf Design fixes for header, QR Code shared element transitions 2015-02-25 19:38:13 +01:00
Dominik Schürmann 27263edda5 CardView and more header design 2015-02-25 18:37:31 +01:00
Dominik Schürmann 4ea59f79cc Use material icon for safeslinger 2015-02-25 15:18:00 +01:00
Dominik Schürmann 8ddca4f8fe Fix menu 2015-02-25 13:49:54 +01:00
Dominik Schürmann fa92ceeae3 Toolbar: qr code in header, cleanup of fragment 2015-02-25 13:49:21 +01:00
Dominik Schürmann 430ba2f777 Bigger status icon in key view 2015-02-25 11:29:46 +01:00
Dominik Schürmann 56d38dd68b First work on new key view toolbar 2015-02-25 02:35:09 +01:00
Dominik Schürmann 2b609b8144 Fix QR Code, design experiments for key view 2015-02-24 13:43:24 +01:00
Dominik Schürmann 17a6003edd Remove tabs in view key 2015-02-24 11:25:19 +01:00
Dominik Schürmann 52bcfd71ad New advanced key view 2015-02-23 23:03:45 +01:00
Dominik Schürmann 29628e54ec Refactor AppsListFragment 2015-02-23 21:55:44 +01:00
Dominik Schürmann 2064d81aef Refactor AppsListFragment 2015-02-23 21:52:04 +01:00
Dominik Schürmann dd3af50956 Uncluttering App Settings: Move advanced info in dialog 2015-02-23 10:36:39 +01:00
Dominik Schürmann 4c7622e257 Remove unused FixedDrawerLayout 2015-02-23 00:30:02 +01:00
Dominik Schürmann 7bddd5be1d Remove old pattern lib, add new pattern lib 2015-02-23 00:28:26 +01:00
Dominik Schürmann 6b57afc350 Removed submodule android-lockpattern 2015-02-23 00:17:27 +01:00
Dominik Schürmann 4e8c4af262 Update tab lib and fix colors of tabs 2015-02-23 00:11:06 +01:00
Dominik Schürmann d984f50cb7 Disable default yubikey PIN by default 2015-02-22 23:55:23 +01:00
Dominik Schürmann e20c6add43 Fix multi select and more colors 2015-02-22 23:52:29 +01:00
Dominik Schürmann f852cb7449 Pull from transifex 2015-02-22 21:41:29 +01:00
Dominik Schürmann df7009669b Pull from transifex 2015-02-22 21:39:34 +01:00
Dominik Schürmann 21e7102e3a Fix back button in encrypt activities 2015-02-22 21:39:20 +01:00
Dominik Schürmann 0cdd68e763 Color for holo 2015-02-22 21:30:27 +01:00
Dominik Schürmann e583edf020 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-22 21:30:02 +01:00
Dominik Schürmann e46fa777ab Use right colors in snackbars and logs 2015-02-22 21:28:57 +01:00
Dominik Schürmann 04740121a5 Go to keyserver settings directly 2015-02-22 21:22:25 +01:00
Dominik Schürmann d0be3bd7ea Once again: Colors and header image 2015-02-22 21:16:40 +01:00
Dominik Schürmann 7e0e16b014 Merge pull request #1047 from steelman/dev-strings
Some Polish translated strings and some tiny cleanups
2015-02-22 10:15:28 +01:00
Łukasz Stelmach d720ac6124 some Polish translations 2015-02-21 23:06:20 +01:00
Łukasz Stelmach db8ee77d56 move a string in the safe slinger activity to resources 2015-02-21 22:29:09 +01:00
Dominik Schürmann 6008b65bbd show app name instead of keys in main list 2015-02-21 21:04:26 +01:00
Dominik Schürmann 32acd94698 Floating action button icons and methods for key list 2015-02-21 20:46:37 +01:00
Dominik Schürmann 5b75985f95 Status bar height fix 2015-02-21 20:01:19 +01:00
Dominik Schürmann 5b017dbf7a Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-20 11:04:18 +01:00
Dominik Schürmann 9d7e05c06e Screenshot for GSoC 2015-02-20 11:04:07 +01:00
Vincent Breitmoser bb30cb5401 fix comments and some warnings in PgpDecryptVerify 2015-02-17 18:43:43 +01:00
Vincent Breitmoser 3efaac2175 determine correct filesize during decryption from LiteralData packet 2015-02-17 18:08:45 +01:00
Dominik Schürmann a468c667bb Improve nav drawer drawable 2015-02-03 19:47:50 +01:00
Dominik Schürmann e2cb1a90cd Improve nav drawer drawable 2015-02-03 19:26:40 +01:00
Dominik Schürmann e29ea517da Fix first time wizard design 2015-02-03 19:13:02 +01:00
Dominik Schürmann dfe92ceb24 Add FAB to key list 2015-02-03 18:51:58 +01:00
Dominik Schürmann d6d679997b Move encrypt decrypt operations in own starter activity 2015-02-03 18:39:07 +01:00
Dominik Schürmann 9e011860c4 More toolbar fixes 2015-02-03 18:10:13 +01:00
Dominik Schürmann b77bbb6027 App settings statusbar fix 2015-02-03 16:10:54 +01:00
Dominik Schürmann 7914aa5c08 Toolbar fixes, Toolbar under status bar on Lollipop 2015-02-03 16:05:18 +01:00
Dominik Schürmann e2a8819385 Floating Action Button added in app settings 2015-02-03 14:28:54 +01:00
Dominik Schürmann c763ea3503 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-02 17:19:31 +01:00
Dominik Schürmann 95e534e1f5 UI experiments for app settings 2015-02-02 17:19:27 +01:00
Vincent Breitmoser 7b24ee7b55 rewrite PgpSignEncrypt data flow
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
2015-02-01 23:14:26 +01:00
Vincent Breitmoser 0b6dc65c97 Merge remote-tracking branch 'origin/development' into development 2015-01-31 18:49:54 +01:00
Vincent Breitmoser 5466d1e980 prevent recursive consolidate 2015-01-31 18:49:00 +01:00
Dominik Schürmann e651a39279 Rename app setting classes for consistency 2015-01-30 10:59:57 +01:00
Dominik Schürmann 464f7c6718 Fix saving of allowed keys 2015-01-30 10:47:40 +01:00
Dominik Schürmann 34b664f4b6 Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 2015-01-30 10:10:13 +01:00
Dominik Schürmann 38f7950d90 Saving of allowed keys 2015-01-29 21:00:58 +01:00
ligi fcd91d881e Add explicit casting to be able to compile with java8 2015-01-29 20:30:26 +01:00
ligi 4aa6e37ac6 Use latest buildTools 2015-01-29 20:28:58 +01:00
Dominik Schürmann d6e4936fa5 Introduce allowed keys table per API client 2015-01-29 17:46:27 +01:00
Dominik Schürmann e0369a2f14 Header image tryout 2015-01-29 17:02:01 +01:00
Dominik Schürmann 34b01e9f2b Remove files related to old nav drawer 2015-01-29 13:36:38 +01:00
Dominik Schürmann 6a7d332606 Fix item layout in apps list 2015-01-29 13:24:08 +01:00
Dominik Schürmann a346b58db7 Close FileDescriptors and input, output streams when possible 2015-01-29 12:44:06 +01:00
Dominik Schürmann c4ef86b38a Refactor DecryptActivity into DecryptOverviewFragment for nav drawer 2015-01-29 12:03:00 +01:00
Dominik Schürmann 03a01dc7ae White popup theme 2015-01-29 11:03:19 +01:00
Dominik Schürmann 43930ed8f2 Move key list logic into fragment, UI fixes for nav drawer 2015-01-29 10:10:07 +01:00
Dominik Schürmann 5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development
Conflicts:
	OpenKeychain/build.gradle
2015-01-29 09:55:09 +01:00
Dominik Schürmann 81d4d31fd7 Cloud search icon 2015-01-28 18:11:08 +01:00
Dominik Schürmann 6c6201f129 Fix cleartext signatures internally 2015-01-27 17:13:54 +01:00
Dominik Schürmann 5a1187b781 Fix nullpointer in ImportKeysActivity 2015-01-27 13:15:24 +01:00
Dominik Schürmann ae7ba2639f Support verification of detached signatures 2015-01-27 13:00:28 +01:00
Dominik Schürmann e8780b4410 Merge branch 'development' into detached-sigs-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
Dominik Schürmann e77f9a5351 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-27 09:43:45 +01:00
Dominik Schürmann fd29d27e61 Temporary nav drawer fixes 2015-01-27 09:37:07 +01:00
Vincent Breitmoser 6c80025ead backend support for charset in ascii-armored streams 2015-01-27 09:17:23 +01:00
Dominik Schürmann fc786280fd Fixes for detached signatures 2015-01-26 17:33:40 +01:00
Vincent Breitmoser efe5c80b1c remove unused NonPgpPartException 2015-01-26 16:33:10 +01:00
Vincent Breitmoser 2bb7c3bcef move last parts of import logic from kis into operation 2015-01-26 16:33:10 +01:00
Dominik Schürmann 34a7728cec Merge branch 'development' into detached-sigs-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2015-01-26 16:30:21 +01:00
Dominik Schürmann e049895b9f Material Design Drawer 2015-01-26 15:24:42 +01:00
Dominik Schürmann e4e2d647c8 Material Design: Full screen dialogs 2015-01-26 00:50:35 +01:00
Vincent Breitmoser b4781343d9 specify our usage of java 1.7 in build files 2015-01-25 12:41:03 +01:00
Vincent Breitmoser 8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Vincent Breitmoser 41aba69fad introduce PromoteKeyOperation to create dummy secret from public keys 2015-01-25 02:08:07 +01:00
Vincent Breitmoser 1516f951b7 work on divert-to-key and other keyring stuff
- allow modifySecretKeyRing operation without passphrase, but a only
  restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
  divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
2015-01-25 01:57:58 +01:00
Vincent Breitmoser fb2fa195bf allow explicit re-certification in SaveKeyringParcel 2015-01-24 23:11:54 +01:00
Vincent Breitmoser 0e0970c347 move key stripping into ChangeSubkey, support divert-to-card 2015-01-24 23:05:50 +01:00
Vincent Breitmoser a65edcdb2f only respect most recent signature for key flags 2015-01-19 18:31:57 +01:00
Vincent Breitmoser e71bd3d9dd always show revoked user ids last! 2015-01-19 18:31:57 +01:00
Dominik Schürmann 3752cdd132 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-19 17:25:36 +01:00
Dominik Schürmann 3ac466c9db Disable sharing chooser blacklisting for lollipop 2015-01-19 17:22:31 +01:00
Vincent Breitmoser 198ddfeff7 use Notify helper everywhere, replace supertoasts with snackbar library 2015-01-19 15:43:35 +01:00
Vincent 491c12d5d3 No setContentView in onCreate for KeyListActivity 2015-01-16 15:41:43 +01:00
Vincent Breitmoser b6f0fb91da show notification if KeyListActivity is spawned with an EXTRA_RESULT
Closes #1029

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2015-01-16 13:58:34 +01:00
Dominik Schürmann 09e992081b Style tabs, add missing drawables 2015-01-15 14:48:13 +01:00
Dominik Schürmann 0c74cc7c3d Fix drawable sizes 2015-01-14 20:25:28 +01:00
Dominik Schürmann fe25a68c6a Yubikey numkey by default to true 2015-01-14 20:19:56 +01:00
Dominik Schürmann 1516ebf26a Toolbar for settings 2015-01-14 20:18:03 +01:00
Dominik Schürmann 85b6669625 Integrate QR Code library instead of requiring the app to be installed, also due to security reasons 2015-01-14 19:14:30 +01:00
Dominik Schürmann 9b093c6d73 Increase minSdk to 15, according to stats 2015-01-14 18:59:18 +01:00
Dominik Schürmann 4ad3c24126 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 14:52:29 +01:00
Dominik Schürmann f397d4f995 Reorganize folders of graphics sources 2015-01-14 14:52:23 +01:00
Vincent Breitmoser 8ef104281b fix ambiguous column name in advanced key info 2015-01-14 14:12:49 +01:00
Dominik Schürmann b4edb88f45 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 14:02:58 +01:00
Dominik Schürmann c94ef60c5d Fix SearchView 2015-01-14 14:02:51 +01:00
Vincent Breitmoser 73feaa974c small fixes to user attribute handling 2015-01-14 13:25:38 +01:00
Vincent Breitmoser 4660608887 fix log entry for addition of user attributes 2015-01-14 13:25:38 +01:00
Dominik Schürmann 99361bdcff Better way to have dark toolbar and light theme 2015-01-14 13:19:21 +01:00
Dominik Schürmann d9e0f0a271 Fix Toolbars in decrypt activities 2015-01-14 10:35:40 +01:00
Dominik Schürmann 5517b4f8cf Launcher icon fixes 2015-01-14 02:03:20 +01:00
Dominik Schürmann 318d3eb120 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 00:04:10 +01:00
Vincent Breitmoser c57355b24a actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:03:02 +01:00
Vincent Breitmoser 2b1c5358b7 make user_ids table typed, with attribute_data support
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
2015-01-14 00:02:53 +01:00
Dominik Schürmann 7da3ddae7b Refactor BaseActivity 2015-01-13 23:43:18 +01:00
Dominik Schürmann d8ff737fc5 Use Toolbar and new BaseActivity 2015-01-13 23:15:13 +01:00
Dominik Schürmann 862d1f1971 Green 2015-01-13 22:18:40 +01:00
Dominik Schürmann 2e3545949b Start working on Material Design 2015-01-13 21:55:53 +01:00
Vincent Breitmoser abd1211613 hack to make WrappedUserAttribute serializable
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
2015-01-13 20:42:40 +01:00
Vincent Breitmoser 84eece622b support addition of user attributes
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/res/values/strings.xml
2015-01-13 20:41:01 +01:00
Vincent Breitmoser 50e515c6cd add support for user attributes in merge() routine 2015-01-13 20:37:26 +01:00
Dominik Schürmann 2f0eb3fbd6 Set minSdk to 14 2015-01-13 19:05:26 +01:00
Vincent Breitmoser fc85ef71a8 remove LinkedIdentity (committed earlier by accident) 2015-01-13 00:10:59 +01:00
Vincent Breitmoser fc3397de5d add support for user attributes (during canonicalization) 2015-01-12 20:08:35 +01:00
Dominik Schürmann 3e74405f3c Merge pull request #1023 from adithyaphilip/development
Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
2015-01-12 11:03:42 +01:00
Abraham Philip 16f924eef3 fixed crash when file scheme is passed, broadened deletion scope 2015-01-09 05:07:50 +05:30
Dominik Schürmann a87a45aa9a No output stream for detached signatures, makes no sense to pipe it through 2015-01-08 14:57:09 +01:00
Dominik Schürmann 1c4b8c193d Experimental API support for detached signatures (not tested) 2015-01-08 14:48:13 +01:00
Dominik Schürmann 6570483fab Test new icon 2015-01-07 14:10:12 +01:00
Dominik Schürmann 816b1bb8c8 OpenPGP instead of PGP 2015-01-07 13:45:28 +01:00
Dominik Schürmann 443fbaff17 PIn not pin passphrase 2015-01-07 13:29:56 +01:00
Dominik Schürmann c4ee00bd39 OpenPGP not PGP 2015-01-07 00:01:57 +01:00
Dominik Schürmann 6ec85b0550 Clearup after lockpattern experiments 2015-01-06 19:29:51 +01:00
Dominik Schürmann af762a65a0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-06 14:52:12 +01:00
Dominik Schürmann e34ad18ed2 Passphrase wizard tests 2015-01-06 14:52:07 +01:00
Vincent Breitmoser 07251f35ae minor stuff 2015-01-03 23:01:57 +01:00
Vincent Breitmoser 47ace7cea3 make certify routines more robust (#1016) 2015-01-03 22:14:12 +01:00
Vincent Breitmoser 2192a6badd add more descriptive string about non-mdc encrypted data 2015-01-03 21:07:33 +01:00
Vincent Breitmoser 320f7d35ef encapsulate high level edit key into new operation class 2015-01-03 13:55:15 +01:00
Vincent Breitmoser 5057ea1744 deal with non-existent user ids during import (#994) 2015-01-02 14:28:03 +01:00
Vincent Breitmoser 920fbdfb42 throw exception if no data is found in getGenericData 2015-01-02 02:24:11 +01:00
Vincent Breitmoser 56f2a3137b get rid of RuntimeException control flow in UncachedKeyRing.fromStream 2015-01-02 02:05:12 +01:00
Vincent Breitmoser b52fb90380 fix and test for bad certificate version numbers (#1012)
closes #1012
2015-01-02 01:58:16 +01:00
Vincent Breitmoser 7223abcf0c extend canonicalize to strip local certificates on export 2015-01-02 00:07:05 +01:00
Vincent Breitmoser 1c1ae769ef small improvements regarding pin tests and logging 2015-01-01 21:13:07 +01:00
Vincent Breitmoser 2d38079574 add empty notation data packet only if necessary 2015-01-01 20:46:39 +01:00
Vincent Breitmoser 5e9d8ca8c6 tests: add multi key encryption/decryption test, new way for fake passphrase cache 2015-01-01 20:21:32 +01:00
Vincent Breitmoser 71c53f13ec fix small merge conflict oversight 2014-12-30 16:24:20 +01:00
Vincent Breitmoser 9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
2014-12-30 13:09:27 +01:00
Vincent Breitmoser 2223cdd405 some small notation data fixes 2014-12-30 13:07:56 +01:00
Vincent Breitmoser 438405d3d2 add PIN as a SecretKeyType 2014-12-30 12:34:24 +01:00
Vincent Breitmoser 7524881a01 fix unit tests for ChangeUnlockParcel 2014-12-30 12:02:37 +01:00
Vincent Breitmoser c7b0b650c1 introduce handling of notation direct key signatures, and experimental pin notation packet 2014-12-30 00:44:12 +01:00
Dominik Schürmann ccde6add70 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-29 23:17:01 +01:00
Dominik Schürmann 610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Vincent Breitmoser 576e6fd0cc introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities 2014-12-29 23:12:11 +01:00
Dominik Schürmann 320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann a86abe04cd Allow for creation date to be in the future up to one day to account for diverging clocks on different systems for fresh keys 2014-12-28 20:57:03 +01:00
Dominik Schürmann 7dbf0abf7b Fix crash on first time wizard 2014-12-28 19:06:17 +01:00
Dominik Schürmann 5c54ab1a0d Merge branch 'development' into keybase-proofs 2014-12-05 15:51:15 +01:00
Dominik Schürmann 26341a325b Update target and support libs to SDK 21, fixing compile issues 2014-12-04 22:48:40 +01:00
Dominik Schürmann 6b9749289f Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-04 19:44:27 +01:00
Dominik Schürmann 389d191448 Merge branch 'master' into development 2014-12-04 19:43:41 +01:00
Dominik Schürmann 450ac161b9 Set version to 3.2beta1 2014-12-04 19:26:10 +01:00
cketti aa8b3db139 Fix spelling of 'K-9 Mail' in FAQ 2014-11-26 04:40:58 +01:00
Tim Bray 2a608c12ca Check fingerprint match between proof & database 2014-11-22 09:27:28 -08:00
Tim Bray 734a085f0d Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
2014-11-21 19:45:35 -08:00
Tim Bray e72c082acd Add check that proof & database fingerprints are the same 2014-11-21 19:44:05 -08:00
Dominik Schürmann 9c133d343f fix signature check 2014-11-22 02:55:42 +01:00
Dominik Schürmann bbbc45e4e9 Dont accept signatures by expired or revoked subkeys 2014-11-22 00:29:14 +01:00
Dominik Schürmann fd60d49d26 Use master key id for keybase proof verification 2014-11-22 00:10:15 +01:00
Dominik Schürmann 47caad3edb Merge branch 'development' into keybase-proofs 2014-11-21 23:55:17 +01:00
Dominik Schürmann a805069c59 more cleanup 2014-11-21 23:55:04 +01:00
Dominik Schürmann dd65d10406 NFC activity design 2014-11-21 13:31:43 +01:00
Dominik Schürmann fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00
Tim Bray 629d83a1ce Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keychain into keybase-proofs 2014-11-19 14:37:06 -08:00
Tim Bray b5cdeb7f5a Prevent multiple cloud-trust-search launches. Handle DNS query failure gracefully. Fixes #1007 & #1008. 2014-11-19 14:35:05 -08:00
Dominik Schürmann 1c0f994d08 Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into keybase-proofs 2014-11-19 22:22:18 +01:00
Tim Bray 0f59e6bd95 In the ImportKeysList display, arrange for Keybase UserIDs to sort below the rest. Also mention Keybase stuff other than Twitter/GitHub/Website 2014-11-18 22:12:50 -08:00
Dominik Schürmann 6691f5118a Version 3.2beta1 2014-11-18 19:04:16 +01:00
Tim Bray 36bac67dd5 All keybase proofs now in place 2014-11-11 18:45:36 -08:00
Tim Bray 3c19e6cfc1 Fix a no-result corner case, and make verifications clickable 2014-11-07 21:07:10 -08:00
Tim Bray 4929e346a2 XML fragment for proof listing 2014-11-07 12:29:17 -08:00
Tim Bray c05441667e Moved from WebView to Spannables, some proof cleanup too 2014-11-07 12:28:27 -08:00
Dominik Schürmann 9de76bb903 Version 3.1.2 2014-11-02 17:54:33 +01:00
Dominik Schürmann f3da3b31e5 Pull from transifex 2014-11-02 17:54:10 +01:00
Dominik Schürmann 602930d929 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-11-02 17:50:38 +01:00
Dominik Schürmann 9dc8c0d506 Changelog 2014-11-02 17:50:31 +01:00
Vincent Breitmoser 1886dd1790 export secret and public keys in separate armored blocks 2014-10-31 18:18:09 +01:00
Vincent Breitmoser 8720a21106 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 19:48:27 +01:00
Vincent Breitmoser 7017527999 forgot a thing for secret key export 2014-10-30 15:14:44 +01:00
Dominik Schürmann f10ec91380 Version 3.1.1 2014-10-30 12:54:17 +01:00
Dominik Schürmann 148c9a5c62 Revert "Version 3.1.1"
This reverts commit 8461f953f6.
2014-10-30 12:54:01 +01:00
Dominik Schürmann 8461f953f6 Version 3.1.1 2014-10-30 12:53:21 +01:00
Dominik Schürmann f4d0e5250b Pull from transifex 2014-10-30 12:52:33 +01:00
Dominik Schürmann 26a4cf2a56 Changelog 3.1.1 2014-10-30 12:48:06 +01:00
Dominik Schürmann 18255e331b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 12:44:13 +01:00
Dominik Schürmann 30c3021fea Always use INTEGER instead of BOOLEAN in database to avoid confusion 2014-10-29 23:41:10 +01:00
Vincent Breitmoser a221464f38 Fix to preselect certification key if only one is available
Closes #981
2014-10-29 22:47:34 +01:00
Vincent Breitmoser 8b53bed6c0 remove unused ExchangeKeySpinner class 2014-10-29 22:45:49 +01:00
Vincent Breitmoser e1285eec7b Close stream on key export to avoid partial write (see #986) 2014-10-29 22:39:38 +01:00
Vincent Breitmoser 727783dd00 retrofit getBlob method of matrixcursor for android 2.3 2014-10-27 17:36:53 +01:00
Dominik Schürmann 3e601431ea Version 3.1 2014-10-26 23:32:57 +01:00
Dominik Schürmann e02b2ab30c Pull from transifex 2014-10-26 23:32:34 +01:00
Dominik Schürmann 5f20abdb26 Pull from transifex 2014-10-26 23:23:30 +01:00
Dominik Schürmann 893a4620c1 Changelog 3.1 2014-10-26 23:15:46 +01:00
Dominik Schürmann e1b0908290 Fix crash with NotFoundException 2014-10-26 22:49:34 +01:00
Dominik Schürmann 1e5797387a Rename multi certify files to certify 2014-10-26 22:41:40 +01:00
Dominik Schürmann be31815ee8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:38:35 +01:00
Dominik Schürmann fa73362a9f Fix notify after certify 2014-10-26 22:38:30 +01:00
Vincent Breitmoser 84b234af37 Display error on certification attempt with yubikey
Closes #978
2014-10-26 22:29:47 +01:00
Vincent Breitmoser ce58eb4b03 disable cancel button instead of hiding it on cancel prevention 2014-10-26 22:26:05 +01:00