aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* modifyKey: small logging changesVincent Breitmoser2014-08-201-2/+2
|
* consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-201-1/+2
|
* consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-201-1/+1
|
* Fix stringsDominik Schürmann2014-08-191-4/+4
|
* consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-191-5/+23
|
* consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-191-0/+3
|
* Header for certs viewDominik Schürmann2014-08-191-0/+1
|
* Add subkey: at least one flag should be selected!Dominik Schürmann2014-08-181-0/+1
|
* consolidate: working implementation, lacking uiVincent Breitmoser2014-08-171-0/+15
|
* modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-161-1/+5
|
* typed expected failures and a couple minor thingsVincent Breitmoser2014-08-161-2/+2
|
* support for master key modifications, among other stuffVincent Breitmoser2014-08-161-1/+3
|
* modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-161-0/+2
|
* modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-161-0/+1
|
* API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵Dominik Schürmann2014-08-161-2/+3
| | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables
* merge: check fingerprints on merge operation! (this needs a testcase!)Vincent Breitmoser2014-08-141-1/+1
|
* change keybase hint following pull request #755Dominik Schürmann2014-08-141-2/+2
|
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-1/+1
|
* Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-1/+2
|
* Remove support for v3 sig generationDominik Schürmann2014-08-141-1/+0
|
* Dont write version header by defaultDominik Schürmann2014-08-141-2/+2
|
* Add user info dialogDominik Schürmann2014-08-131-0/+8
|
* API: User interaction when account keys are deletedDominik Schürmann2014-08-131-0/+1
|
* Readd missing stringDominik Schürmann2014-08-071-0/+1
|
* Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-1/+1
|
* Increase maximum custom RSA sizeDominik Schürmann2014-08-051-1/+1
|
* Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵Dominik Schürmann2014-08-051-1/+1
| | | | selection for adding new subkeys
* More work on add subkey dialog designDominik Schürmann2014-08-051-1/+1
|
* Better handling of user id revocation in UI codeDominik Schürmann2014-08-051-0/+5
|
* Refactor expiry dialogDominik Schürmann2014-08-051-1/+1
|
* KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-1/+1
|
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-75/+0
|
* Even more smaller nitpicksDominik Schürmann2014-08-041-0/+1
|
* button language in encryptDominik Schürmann2014-08-041-2/+1
|
* Smaller UI fixesDominik Schürmann2014-08-041-2/+3
|
* Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-041-2/+10
|\ | | | | Improve file encrypt
| * Minor cleanupmar-v-in2014-08-021-0/+1
| |
| * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-1/+1
| |\
| * \ Merge branch 'master' into improve-file-moremar-v-in2014-08-011-18/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| * | | Fix string resourcesmar-v-in2014-07-311-4/+5
| | | |
| * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-312-15/+88
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring
| * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-061-7/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI
| * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-021-0/+2
| | | | | |
| * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-011-12/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-221-8/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more
| * | | | | | | Improve file more, Part 1mar-v-in2014-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion)
* | | | | | | | Add user id with dialogDominik Schürmann2014-08-011-3/+3
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | identity instead of credentialsDominik Schürmann2014-08-011-1/+1
| |_|_|_|_|/ |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 19:58:29 +0000