| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -7/+3 |
| |\ | |||||
| | * | Upload key working | Dominik Schürmann | 2014-08-20 | 1 | -7/+3 |
| | | | |||||
| * | | make number of secret keys imported part of ImportResult parcel | Vincent Breitmoser | 2014-08-20 | 1 | -3/+6 |
| |/ | |||||
| * | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -6/+15 |
| | | |||||
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -2/+8 |
| | | |||||
| * | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -4/+4 |
| | | |||||
| * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -11/+11 |
| | | |||||
| * | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 1 | -2/+10 |
| | | |||||
| * | Fix keybase import | Dominik Schürmann | 2014-06-20 | 1 | -0/+2 |
| | | |||||
| * | fix key export | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| | | |||||
| * | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -1/+2 |
| | | |||||
| * | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 1 | -2/+4 |
| | | |||||
| * | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -4/+7 |
| | | |||||
| * | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 1 | -10/+7 |
| | | |||||
| * | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -19/+25 |
| | | |||||
| * | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -2/+0 |
| | | |||||
| * | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -16/+29 |
| | | |||||
| * | import-log: add output to logcat (for debugging) | Vincent Breitmoser | 2014-06-06 | 1 | -7/+8 |
| | | |||||
| * | do respect expectedFingerprint during key import | Vincent Breitmoser | 2014-06-04 | 1 | -1/+12 |
| | | |||||
| * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -2/+2 |
| | | |||||
| * | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 1 | -81/+21 |
| | | | | | ImportKeysListEntry | ||||
| * | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 1 | -3/+3 |
| | | |||||
| * | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 1 | -8/+4 |
| | | |||||
| * | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -5/+14 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 1 | -3/+3 |
| |\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 1 | -3/+3 |
| | | | |||||
| * | | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 1 | -3/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -4/+8 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 1 | -5/+8 |
| | | | |||||
| * | | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -1/+1 |
| | | | | | | | | | KeychainIntentService! | ||||
| * | | wrapped-key-ring: move certification logic into secretkey | Vincent Breitmoser | 2014-05-03 | 1 | -40/+29 |
| | | | |||||
| * | | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -3/+5 |
| |/ | | | | signencrypt | ||||
| * | Rename ProgressDialogUpdater to Progressable | Thialfihar | 2014-04-29 | 1 | -12/+12 |
| | | | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders. | ||||
| * | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -17/+20 |
| | | |||||
| * | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 1 | -1/+1 |
| | | |||||
| * | Refactor ProviderHelper to be non-static using a constructor based on ↵ | Dominik Schürmann | 2014-04-11 | 1 | -5/+9 |
| | | | | | context (first commit to get context out of pgp classes) | ||||
| * | Use NotFoundException in more places | Dominik Schürmann | 2014-04-08 | 1 | -6/+12 |
| | | |||||
| * | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 1 | -9/+10 |
| | | |||||
| * | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 1 | -1/+1 |
| | | |||||
| * | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+294 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |