Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add license headers | Dominik Schürmann | 2014-08-04 | 2 | -0/+34 |
| | |||||
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -4/+4 |
| | |||||
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -22/+17 |
| | |||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 2 | -89/+79 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java | ||||
| * | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -67/+64 |
| | | |||||
| * | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -23/+13 |
| | | |||||
| * | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -0/+4 |
| | | |||||
| * | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 |
| |\ | |||||
| | * | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 |
| | | | |||||
| * | | some fixes for edit | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 |
| |/ | |||||
| * | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 1 | -6/+5 |
| | | |||||
* | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 1 | -0/+2 |
| | | | | | | | | | | - UI fixes - refactoring | ||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml | ||||
| * | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+5 |
| | | | | | | | | closes #703 | ||||
* | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 2 | -10/+56 |
| | | | | | | | | | | - Multi file - Reworked UI | ||||
* | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 1 | -7/+7 |
| | | |||||
* | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 1 | -0/+151 |
|/ | | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned. | ||||
* | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -2/+2 |
| | |||||
* | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 2 | -65/+41 |
| | | | | closes #698 | ||||
* | fix indentation in various key import methods | Vincent Breitmoser | 2014-06-22 | 1 | -60/+64 |
| | |||||
* | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 1 | -13/+2 |
| | |||||
* | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -18/+18 |
| | |||||
* | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -42/+54 |
| | |||||
* | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -43/+166 |
| | |||||
* | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -0/+13 |
| | |||||
* | code cleanup in ProviderHelper and UncachedKeyRing | Vincent Breitmoser | 2014-06-18 | 1 | -10/+2 |
| | |||||
* | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 1 | -0/+8 |
| | |||||
* | consolidate: first draft | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| | |||||
* | import-log: don't count self certs as unknown | Vincent Breitmoser | 2014-06-18 | 1 | -0/+1 |
| | |||||
* | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 1 | -73/+85 |
| | |||||
* | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 1 | -1/+4 |
| | |||||
* | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 1 | -0/+6 |
| | |||||
* | import-log: clean up progress messages | Vincent Breitmoser | 2014-06-17 | 1 | -1/+0 |
| | |||||
* | drop invalid user ids and add fatal case(s) | Vincent Breitmoser | 2014-06-16 | 1 | -0/+3 |
| | |||||
* | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 1 | -1/+26 |
| | |||||
* | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵ | Vincent Breitmoser | 2014-06-16 | 1 | -23/+41 |
| | | | | more docs | ||||
* | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 1 | -35/+9 |
| | |||||
* | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -6/+5 |
| | |||||
* | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 1 | -25/+19 |
| | |||||
* | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -48/+65 |
| | |||||
* | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -1/+1 |
| | |||||
* | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 1 | -8/+10 |
| | |||||
* | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -13/+5 |
| | |||||
* | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -1/+1 |
| | |||||
* | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -9/+15 |
| | |||||
* | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -14/+30 |
| | |||||
* | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -64/+103 |
| | |||||
* | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 1 | -14/+37 |
| | |||||
* | import-log: add output to logcat (for debugging) | Vincent Breitmoser | 2014-06-06 | 1 | -0/+7 |
| |