Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |