aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
Commit message (Collapse)AuthorAgeFilesLines
* Edit key: key flagsDominik Schürmann2014-08-051-0/+1
|
* Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵Dominik Schürmann2014-08-051-4/+9
| | | | selection for adding new subkeys
* Refactor expiry dialogDominik Schürmann2014-08-051-12/+24
|
* KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-0/+10
|
* Edit key: subkey adding, not finishedDominik Schürmann2014-08-041-13/+23
|
* Add user id with dialogDominik Schürmann2014-08-011-1/+1
|
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-111-46/+81
|\ | | | | | | | | | | | | 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
| * Work on subkeys adapterDominik Schürmann2014-07-081-46/+81
|/
* fix nullpointer, cleanupDominik Schürmann2014-07-021-3/+2
|
* remove init methods from adapterDominik Schürmann2014-07-021-51/+30
|
* Rename adapterDominik Schürmann2014-06-221-0/+211