aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-06198-5145/+4618
|\ | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle
| * ModernPGP infosDominik Schürmann2014-08-061-1/+1
| |
| * Update changelog and aboutDominik Schürmann2014-08-062-89/+104
| |
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-058-32/+32
| |
| * Optimize importsDominik Schürmann2014-08-0541-66/+64
| |
| * Increase maximum custom RSA sizeDominik Schürmann2014-08-052-2/+2
| |
| * Edit key: key flagsDominik Schürmann2014-08-056-17/+28
| |
| * Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵Dominik Schürmann2014-08-0510-78/+102
| | | | | | | | selection for adding new subkeys
| * More work on add subkey dialog designDominik Schürmann2014-08-053-7/+15
| |
| * Work on add subkey dialog designDominik Schürmann2014-08-055-86/+127
| |
| * Better handling of user id revocation in UI codeDominik Schürmann2014-08-054-19/+75
| |
| * Create key: make single user id primary user id, other cleanupDominik Schürmann2014-08-053-6/+7
| |
| * Refactor expiry dialogDominik Schürmann2014-08-057-227/+308
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-052-3/+7
| |\
| | * Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-08-042-3/+7
| | |
| * | KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-0510-35/+56
| |/
| * Add license headersDominik Schürmann2014-08-0419-0/+323
| |
| * Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
| |
| * Pull from transifexDominik Schürmann2014-08-0443-1143/+1131
| |
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-0438-93/+19
| |
| * More cleanupDominik Schürmann2014-08-041-3/+4
| |
| * Even more smaller nitpicksDominik Schürmann2014-08-042-12/+24
| |
| * Remove support for IO_FILE, this is no longer used and was never a good ↵Dominik Schürmann2014-08-041-29/+2
| | | | | | | | practice, use IO_URI on Android!
| * Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-047-25/+98
| |
| * Fix debug backup/restore methodsDominik Schürmann2014-08-044-30/+24
| |
| * Remove old edit key stuffDominik Schürmann2014-08-046-1375/+0
| |
| * Edit key: subkey adding, not finishedDominik Schürmann2014-08-0414-561/+259
| |
| * button language in encryptDominik Schürmann2014-08-042-3/+1
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-041-102/+0
| |\
| | * delete unused PgpConversionHelperVincent Breitmoser2014-08-041-102/+0
| | |
| * | Smaller UI fixesDominik Schürmann2014-08-047-56/+59
| |/
| * Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0452-1349/+2049
| |\ | | | | | | Improve file encrypt
| | * Minor cleanupmar-v-in2014-08-024-3/+3
| | |
| | * Fix focusing with To fieldmar-v-in2014-08-023-3/+20
| | |
| | * Encrypt UI (drop downs)mar-v-in2014-08-016-35/+75
| | |
| | * Cache input file thumbnail.mar-v-in2014-08-011-3/+20
| | |
| | * Cache contact photos to make UI more fluidmar-v-in2014-08-011-0/+10
| | |
| | * Fix first key is not used erroneouslymar-v-in2014-08-011-1/+0
| | |
| | * Merge branch 'master' into improve-file-moremar-v-in2014-08-012-9/+15
| | |\
| | * | Fixes after mergemar-v-in2014-08-011-2/+5
| | | |
| | * | Merge branch 'master' into improve-file-moremar-v-in2014-08-0125-206/+299
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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-313-6/+7
| | | | |
| | * | | Fix mergemar-v-in2014-07-314-37/+21
| | | | |
| | * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-31212-3361/+4240
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3115-126/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring
| | * | | | Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
| | | | | |
| | * | | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-2011-578/+597
| | | | | |
| | * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0670-1927/+3537
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0636-346/+898
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI
| | * | | | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
| | | | | | |