Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Open keyboard on passphrase dialog, this should now work on all Android ↵ | Dominik Schürmann | 2014-07-27 | 2 | -27/+92 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | versions... hopefully | |||||
* | | | | | | | Make PassphraseCacheService a foreground service | Dominik Schürmann | 2014-07-27 | 1 | -72/+67 | |
| | | | | | | | ||||||
* | | | | | | | Prettify buttons | Dominik Schürmann | 2014-07-27 | 1 | -7/+6 | |
| | | | | | | | ||||||
* | | | | | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 5 | -22/+90 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 2 | -18/+30 | |
| | | | | | | ||||||
* | | | | | | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 | |
| | | | | | | ||||||
* | | | | | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-26 | 4 | -43/+48 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Program flow fixes | Dominik Schürmann | 2014-07-25 | 4 | -43/+48 | |
| | | | | | | | ||||||
* | | | | | | | UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings | Vincent Breitmoser | 2014-07-26 | 1 | -12/+9 | |
| | | | | | | | ||||||
* | | | | | | | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 2 | -15/+18 | |
| | | | | | | | ||||||
* | | | | | | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 2 | -0/+6 | |
|/ / / / / / | ||||||
* | | | | | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 4 | -5/+9 | |
| | | | | | | ||||||
* | | | | | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 36 | -906/+728 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |||||
| * | | | | | | Temporary program flow fixes | Dominik Schürmann | 2014-07-16 | 1 | -0/+3 | |
| | | | | | | | ||||||
| * | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 2 | -46/+57 | |
| | | | | | | | ||||||
| * | | | | | | New first time screen | Dominik Schürmann | 2014-07-16 | 6 | -474/+241 | |
| | | | | | | | ||||||
| * | | | | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 11 | -13/+34 | |
| | | | | | | | ||||||
| * | | | | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 9 | -22/+21 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | signatures: a revocation reason does NOT determine if a cert is a revocation ↵ | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type | |||||
| * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 3 | -3/+8 | |
| |\| | | | | | | ||||||
| | * | | | | | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 3 | -3/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | some fixes for edit | Dominik Schürmann | 2014-07-15 | 2 | -4/+5 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 5 | -23/+373 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | | | | | | | modifyKey: error out on integrity check fails | Vincent Breitmoser | 2014-07-12 | 2 | -10/+18 | |
| | | | | | | | | ||||||
| * | | | | | | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 2 | -44/+61 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 6 | -62/+262 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | |||||
| * | | | | | | | | modifyKey: proper expiry check during SubkeyAdd | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 4 | -27/+64 | |
| | | | | | | | | | ||||||
| * | | | | | | | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 8 | -69/+66 | |
| | | | | | | | | | ||||||
| * | | | | | | | | test: get rid of some SaveKeyringParcel boilerplate | Vincent Breitmoser | 2014-07-11 | 1 | -5/+11 | |
| | | | | | | | | | ||||||
| * | | | | | | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 2 | -4/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 2 | -0/+11 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fix bug in canonicalization regarding subkey revocation | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | modifyKey: couple more fixes from tests | Vincent Breitmoser | 2014-07-11 | 2 | -4/+34 | |
| | | | | | | | | | ||||||
| * | | | | | | | | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 3 | -18/+67 | |
| | | | | | | | | | ||||||
| * | | | | | | | | modifyKey: preserve master key flags | Vincent Breitmoser | 2014-07-11 | 1 | -5/+22 | |
| | | | | | | | | | ||||||
| * | | | | | | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 2 | -2/+11 | |
| | | | | | | | | | ||||||
| * | | | | | | | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 2 | -0/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch ↵ | Vincent Breitmoser | 2014-07-09 | 8 | -830/+1 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | |||||
| | * | | | | | | | | actually provide a tostring | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | prevent odd ambiguous method toString error | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | (c) headers, tidy imports | Art O Cathain | 2014-07-07 | 6 | -7/+100 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java | |||||
| | * | | | | | | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Actually test canonicalize | Art O Cathain | 2014-07-06 | 2 | -75/+160 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | data fixes | Art O Cathain | 2014-07-06 | 1 | -13/+14 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 | |
| | | | | | | | | | |