Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | make number of secret keys imported part of ImportResult parcel | Vincent Breitmoser | 2014-08-20 | 2 | -5/+11 |
| | |||||
* | close actionmode in keylist on loading events (avoid inconsistent state) | Vincent Breitmoser | 2014-08-20 | 1 | -0/+10 |
| | |||||
* | consolidate: remove debug "breakpoint" | Vincent Breitmoser | 2014-08-20 | 1 | -5/+0 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 2 | -9/+7 |
|\ | |||||
| * | progress dialog design fix | Dominik Schürmann | 2014-08-20 | 2 | -9/+7 |
| | | |||||
* | | modifyKey: small logging changes | Vincent Breitmoser | 2014-08-20 | 2 | -3/+3 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 4 | -91/+115 |
|\ | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 7 | -19/+30 |
| |\ | |||||
| * | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 4 | -91/+115 |
| | | | |||||
* | | | return some more results | Dominik Schürmann | 2014-08-20 | 6 | -35/+41 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 8 | -54/+74 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 15 | -76/+135 |
| |\ | |||||
| * | | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 5 | -49/+67 |
| | | | |||||
| * | | consolidate: use KeychainProvider for deletion operation | Vincent Breitmoser | 2014-08-20 | 4 | -5/+7 |
| | | | |||||
* | | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 7 | -19/+30 |
| |/ |/| | |||||
* | | Pull from transifex | Dominik Schürmann | 2014-08-20 | 15 | -76/+135 |
|/ | |||||
* | Pull from transifex | Dominik Schürmann | 2014-08-20 | 32 | -338/+1203 |
| | |||||
* | Fix mime types, #781 | mar-v-in | 2014-08-19 | 2 | -3/+5 |
| | |||||
* | Fix strings | Dominik Schürmann | 2014-08-19 | 3 | -7/+7 |
| | |||||
* | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 4 | -35/+108 |
| | |||||
* | Start consolidate activity | Dominik Schürmann | 2014-08-19 | 1 | -1/+8 |
| | |||||
* | ConsolidateDialogActivity | Dominik Schürmann | 2014-08-19 | 2 | -41/+30 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 10 | -27/+266 |
|\ | |||||
| * | stub for consolidate recovery in KeychainApplication | Vincent Breitmoser | 2014-08-19 | 1 | -1/+8 |
| | | |||||
| * | add ProgressFixedScaler (forgot in a previous commit) | Vincent Breitmoser | 2014-08-19 | 1 | -0/+29 |
| | | |||||
| * | add OpenDialogActivity (stub) | Vincent Breitmoser | 2014-08-19 | 1 | -0/+117 |
| | | |||||
| * | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 7 | -26/+112 |
| | | |||||
* | | Scroll fixes for certify activity | Dominik Schürmann | 2014-08-19 | 3 | -8/+21 |
|/ | |||||
* | Notes about criticality | Dominik Schürmann | 2014-08-19 | 1 | -2/+15 |
| | |||||
* | Decrease iteration count, delayed for 2.9 | Dominik Schürmann | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 1 | -1/+3 |
|\ | |||||
| * | fix primary user id in master key flag modification | Vincent Breitmoser | 2014-08-19 | 1 | -1/+3 |
| | | |||||
* | | Change criticallity of subpackets after discussion | Dominik Schürmann | 2014-08-19 | 1 | -5/+5 |
|/ | |||||
* | Use higher s2k count | Dominik Schürmann | 2014-08-19 | 1 | -10/+29 |
| | |||||
* | Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible | Dominik Schürmann | 2014-08-19 | 1 | -20/+22 |
| | |||||
* | Mark packets critical | Dominik Schürmann | 2014-08-19 | 1 | -11/+11 |
| | |||||
* | add feature to key sig subpacket to indicate that we want MDC | Dominik Schürmann | 2014-08-19 | 1 | -0/+3 |
| | |||||
* | New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering | Dominik Schürmann | 2014-08-19 | 1 | -7/+17 |
| | |||||
* | Add license headers | Dominik Schürmann | 2014-08-19 | 3 | -0/+51 |
| | |||||
* | certs header design | Dominik Schürmann | 2014-08-19 | 1 | -3/+11 |
| | |||||
* | Header for certs view | Dominik Schürmann | 2014-08-19 | 3 | -23/+39 |
| | |||||
* | Add subkey: at least one flag should be selected! | Dominik Schürmann | 2014-08-18 | 2 | -53/+75 |
| | |||||
* | Fixes for expiry UI | Dominik Schürmann | 2014-08-18 | 6 | -69/+111 |
| | |||||
* | Merge pull request #772 from mar-v-in/issue-729 | Vincent | 2014-08-17 | 4 | -102/+25 |
|\ | | | | | Remove NoSwipeWrapContentViewPager | ||||
| * | Work-around rendering bug when switching back to asymmetric with multiple ↵ | mar-v-in | 2014-08-17 | 1 | -14/+2 |
| | | | | | | | | recipients selected | ||||
| * | Remove NoSwipeWrapContentViewPager | mar-v-in | 2014-08-17 | 3 | -88/+23 |
| | | |||||
* | | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 9 | -15/+302 |
| | | |||||
* | | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 3 | -7/+9 |
| | | |||||
* | | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 3 | -3/+57 |
| | | |||||
* | | use correct algorithm for signatures (actually fix heterogeneous subkeys) | Vincent Breitmoser | 2014-08-16 | 1 | -4/+4 |
| | |