Commit Graph

111 Commits

Author SHA1 Message Date
Thialfihar 77a6c509f7 Replace wildcard imports with explicit imports 2014-04-02 13:37:12 +02:00
Thialfihar 592ab31d86 Add missing and curly brackets and fix others
Style guide demands them even for single-line blocks, and opening
curly brackets never appear on a line on their own.
2014-04-02 10:51:02 +02:00
Thialfihar 82e5d14fb1 Rearrange too long lines 2014-04-02 10:51:02 +02:00
Thialfihar dd4a1e3f52 Trivial spacing changes to conform to style guide 2014-04-02 10:51:02 +02:00
Thialfihar e92658f44d Adjust import order 2014-04-02 10:51:02 +02:00
Ashley Hughes 2ad616ed3f pass through info that keys are new without relying on new keys orginally being empty 2014-04-01 23:37:13 +01:00
Dominik Schürmann ecca54d4d5 Automatically select newly created key in api accounts 2014-04-01 17:08:56 +02:00
Vincent Breitmoser 6f36b72eee PgpKeyOperation: factor out all android dependencies
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-04-01 16:12:57 +02:00
Dominik Schürmann ebb7f55921 Fix symmetric decryption 2014-04-01 16:08:40 +02:00
Dominik Schürmann 866d2d28cc Simplify encrypt and sign backend 2014-04-01 14:25:37 +02:00
Dominik Schürmann c859bbb6da Fix symmetric encryption and cleanup 2014-04-01 14:10:32 +02:00
Ashley Hughes 5bc902dbb1 create three keys by default 2014-03-31 23:23:51 +01:00
Ashley Hughes 47b23a90d5 change how new default keys are passed back, fix showing their usage flags 2014-03-31 22:42:24 +01:00
Dominik Schürmann 55a2cbe9c3 Decrypt mostly works again 2014-03-30 20:53:16 +02:00
Dominik Schürmann 2947ab7e48 More experimental work on decrypt fragments 2014-03-30 19:32:05 +02:00
Ashley Hughes e1d07214df merge master 2014-03-29 13:21:39 +00:00
Ashley Hughes 4923c9b8e3 add original primary ID field to parcel 2014-03-26 00:29:39 +00:00
Dominik Schürmann 7111a4265d Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-25 19:11:32 +01:00
Thialfihar c9053b97a8 Rename old mentionings of APG-named things
Mostly in comments, most importantly: STORE_PATH now ends in
/KeychainBlobs instead of /ApgBlobs
2014-03-23 21:58:18 +01:00
Dominik Schürmann 9555ae3bc1 Move classes for OpenPGP API into remote package 2014-03-23 01:26:49 +01:00
Dominik Schürmann ff67ddc5f4 Merge pull request #469 from honnel/save-key-workaround
Can't save key after key generation
2014-03-23 00:13:18 +01:00
Dominik Schürmann 153b99a186 Use new FoldableLinearLayout in API settings 2014-03-23 00:03:49 +01:00
Daniel Hammann 9c18062951 The current implementation of saving new generated key doesn't save the key due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id. 2014-03-22 15:42:50 +01:00
Dominik Schürmann 59d51fe68e Fix fingerprint handling 2014-03-20 19:48:18 +01:00
Dominik Schürmann 0510e0e217 verify downloaded key by comparing fingerprints 2014-03-20 19:11:51 +01:00
Dominik Schürmann 2b77489932 Dont try to parse key/fingerprint result from keyserver query 2014-03-20 15:54:49 +01:00
Alexander Sulfrian 69d26496a2 use correct LongSparseArray for minimum api level 2014-03-19 14:26:00 +01:00
Dominik Schürmann 711a51f7fc Merge pull request #430 from Valodim/certify
Revamp certify dialogue
2014-03-18 14:43:20 +01:00
Vincent Breitmoser 87004fd0ca certify: preserve user id certificates when saving secret keys 2014-03-17 14:11:32 +01:00
Vincent Breitmoser 95be228b47 certify: sign individual UIDs
direct signing of pubkeys is out for now. not sure how this should be
handled, but it's trivial to re-add so leaving this up for discussion
for now.
2014-03-15 18:20:50 +01:00
Vincent Breitmoser 1de0312bb5 certify: revamp certifykeyactivity
show info on the key to be certified, along with a list of (selectable)
user ids. user ids are handed through to the signing service, but not
yet handled.
2014-03-15 18:20:49 +01:00
uberspot e387dd7c54 Fix export for new unified key list #409 2014-03-15 01:51:01 +02:00
uberspot 540aa044e2 Fix code style in keychain/service/ 2014-03-13 20:14:04 +02:00
uberspot 79a8528a63 Optimize imports in all files, remove useless whitespace in some and fix indentation 2014-03-13 20:14:04 +02:00
grait ccdf646c19 Export cancellable - minor changes 2014-03-13 05:58:48 +05:30
grait 3f649d4458 Export is cancellable now 2014-03-13 05:40:40 +05:30
uberspot d586ad288d fix plenty of lint warnings, make some for loops into foreach, remove unused imports and throw exceptions 2014-03-11 23:42:45 +02:00
uberspot 361c45a481 Make export work with rowIds instead of MasterKeyIds 2014-03-11 03:22:05 +02:00
uberspot d937317012 Remove duplicate code from ActionBarHelper. You can now set the drawables via the method calls 2014-03-11 01:50:17 +02:00
Dominik Schürmann 59091e417f getString before init of KeychainIntentHandler 2014-03-10 22:37:13 +01:00
Dominik Schürmann bac68c4c73 Fix progress_generating and reformat 2014-03-10 22:22:37 +01:00
Dominik Schürmann be41a0a3e1 Fix progress_generating and reformat 2014-03-10 22:19:43 +01:00
grait 4874ea567a progress bar while key creation - added plurals based on no.of keys while key creation 2014-03-09 17:45:58 +05:30
grait 3fbda4245c progress is shown when creating the default key based on number of keys created so far 2014-03-08 03:27:22 +05:30
uberspot ca851ba21f remove unused imports and unthrown exceptions 2014-03-07 22:35:49 +02:00
Ashley Hughes fba0e2af1d keep up with master 2014-03-07 15:16:13 +00:00
Dominik Schürmann 59067f9f8b API: get key 2014-03-07 11:24:53 +01:00
Ashley Hughes 04fa0e9cc7 use parcel to save keys, but saving existing keys is disabled, pending a rewrite... 2014-03-06 23:47:11 +00:00
Dominik Schürmann 3d944483d3 Merge pull request #344 from ankushb92/ankush2
#338
2014-03-06 21:59:56 +01:00
Ankush 8e29b82d6d corrected commit
mCurrentPassPhrase, mChangePassPhrase

Minor variable naming Issue #338
2014-03-07 00:43:09 +05:30