Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | import-log: add log statements in import routine | Vincent Breitmoser | 2014-06-06 | 1 | -94/+188 | |
| | ||||||
* | import-log: improve operationresultparcel, add indentation | Vincent Breitmoser | 2014-06-06 | 1 | -4/+23 | |
| | ||||||
* | fix bug with bad verifying master keys | Vincent Breitmoser | 2014-06-04 | 1 | -3/+3 | |
| | ||||||
* | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -3/+3 | |
| | ||||||
* | wrapped-key-ring: add documentation | Vincent Breitmoser | 2014-06-02 | 1 | -0/+16 | |
| | ||||||
* | make everything work again | Vincent Breitmoser | 2014-06-02 | 1 | -2/+14 | |
| | ||||||
* | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 3 | -12/+11 | |
| | ||||||
* | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 2 | -214/+85 | |
| | ||||||
* | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -8/+7 | |
| | ||||||
* | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 2 | -28/+22 | |
| | ||||||
* | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 3 | -12/+14 | |
| | ||||||
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 3 | -38/+152 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 3 | -143/+178 | |
|\ | | | | | | | | | | | | | | | | | 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 | |||||
| * | proper null checks and closing of cursors everywhere | Vincent Breitmoser | 2014-05-08 | 3 | -127/+159 | |
| | | ||||||
| * | use longsparsearrays instead of hashmaps in that one place | Vincent Breitmoser | 2014-05-08 | 1 | -16/+19 | |
| | | ||||||
* | | wrapped-key-ring: remove more unneeded methods | Vincent Breitmoser | 2014-05-04 | 1 | -17/+0 | |
| | | ||||||
* | | wrapped-key-ring: redesign underlying CachedKeyRing | Vincent Breitmoser | 2014-05-04 | 1 | -65/+35 | |
| | | ||||||
* | | wrapped-key-ring: cached data revamp | Vincent Breitmoser | 2014-05-04 | 1 | -33/+37 | |
| | | ||||||
* | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragment | Vincent Breitmoser | 2014-05-04 | 1 | -8/+0 | |
| | | ||||||
* | | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -1/+19 | |
| | | | | | | | | KeychainIntentService! | |||||
* | | wrapped-key-ring: move certification logic into secretkey | Vincent Breitmoser | 2014-05-03 | 1 | -0/+4 | |
| | | ||||||
* | | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵ | Vincent Breitmoser | 2014-05-03 | 3 | -1/+123 | |
|/ | | | | signencrypt | |||||
* | Formatting KeychainDatabase | Dominik Schürmann | 2014-04-29 | 1 | -17/+17 | |
| | ||||||
* | Clarify sqlite datatypes | Dominik Schürmann | 2014-04-29 | 1 | -2/+12 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-22 | 1 | -1/+2 | |
|\ | ||||||
| * | Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003' | Vincent Breitmoser | 2014-04-22 | 1 | -1/+2 | |
| |\ | ||||||
| | * | fix nullpointer on missing s2k | Vincent Breitmoser | 2014-04-20 | 1 | -1/+2 | |
| | | | | | | | | | | | | Fixes #590 | |||||
* | | | add has_secret for all who are upgrading from a beta version | Dominik Schürmann | 2014-04-22 | 1 | -3/+9 | |
|/ / | ||||||
* / | Fix a nullptr in KeychainProvider | Vincent Breitmoser | 2014-04-20 | 1 | -1/+1 | |
|/ | | | | Fixes #589 | |||||
* | Fix some smaller annoyances, closes #583, #582 | Dominik Schürmann | 2014-04-19 | 2 | -11/+5 | |
| | ||||||
* | fix unified query columns for select*fragment | Vincent Breitmoser | 2014-04-18 | 2 | -6/+5 | |
| | ||||||
* | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 1 | -1/+1 | |
| | ||||||
* | Remove kill hack in KeychainDatabase | Dominik Schürmann | 2014-04-17 | 1 | -9/+0 | |
| | ||||||
* | Remove dev hack in KeychainDatabase | Dominik Schürmann | 2014-04-17 | 1 | -5/+0 | |
| | ||||||
* | NotFoundExceptions for all getGeneric-type methods | Vincent Breitmoser | 2014-04-17 | 1 | -4/+7 | |
| | ||||||
* | add up navigation in ViewCertActivity | Vincent Breitmoser | 2014-04-17 | 1 | -0/+4 | |
| | | | | Fixes #567 | |||||
* | Rename provider types following ↵ | Dominik Schürmann | 2014-04-17 | 1 | -12/+35 | |
| | | | | http://developer.android.com/guide/topics/providers/content-provider-creating.html | |||||
* | Fix more whitespace | Vincent | 2014-04-16 | 1 | -2/+2 | |
| | ||||||
* | stripped support: implement has_secret support, in ui and impot of secret keys | Vincent Breitmoser | 2014-04-16 | 2 | -7/+49 | |
| | | | | Closes #570 | |||||
* | stripped support: add has_secret column to keys table | Vincent Breitmoser | 2014-04-16 | 3 | -3/+14 | |
| | ||||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 1 | -2/+2 | |
| | ||||||
* | KeychainDatabase cleanup | Dominik Schürmann | 2014-04-14 | 1 | -21/+27 | |
| | ||||||
* | move old apg.db to apg_old.db (half measure~) | Vincent Breitmoser | 2014-04-14 | 1 | -12/+8 | |
| | ||||||
* | add debug backup/restore options to main menu | Vincent Breitmoser | 2014-04-14 | 1 | -1/+44 | |
| | | | | Closes #543 | |||||
* | Remove unused blob classes and other dead code | Dominik Schürmann | 2014-04-13 | 6 | -287/+11 | |
| | ||||||
* | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 2 | -2/+2 | |
| | ||||||
* | More cleanup in providerHelper | Dominik Schürmann | 2014-04-11 | 1 | -13/+10 | |
| | ||||||
* | Refactor ProviderHelper to be non-static using a constructor based on ↵ | Dominik Schürmann | 2014-04-11 | 2 | -119/+132 | |
| | | | | context (first commit to get context out of pgp classes) | |||||
* | split getMasterKeyId for the remaining use cases | Vincent Breitmoser | 2014-04-11 | 1 | -8/+13 | |
| | | | | Closes #549 | |||||
* | get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredString | Vincent Breitmoser | 2014-04-11 | 1 | -54/+60 | |
| |