aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add option to pass original filename to PgpSignEncryptDominik Schürmann2014-08-111-12/+20
| |
| * progress for signing binaryDominik Schürmann2014-08-111-15/+27
| |
| * More fixes for decryption progressDominik Schürmann2014-08-111-18/+11
| |
| * Handle missing MDC as failed only if no valid signature is presentDominik Schürmann2014-08-102-1/+9
| |
| * More fixes for decryption progressDominik Schürmann2014-08-101-6/+4
| |
| * Handle missing integrity protection MDC packet as if integrity check would ↵Dominik Schürmann2014-08-101-4/+5
| | | | | | | | | | | | have failed. An attacker could strip the MDC on its way to the receiver...
| * Introduction of metadata api, starting to fix decryption progressDominik Schürmann2014-08-103-44/+84
| |
| * Fix compression setting for encryption of filesDominik Schürmann2014-08-101-4/+7
| |
| * Edit key: prevent the combination of change to primary user id and revocationDominik Schürmann2014-08-071-0/+4
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-0685-3041/+2839
|\| | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-057-31/+31
| |
| * Optimize importsDominik Schürmann2014-08-0541-66/+64
| |
| * Increase maximum custom RSA sizeDominik Schürmann2014-08-051-1/+1
| |
| * Edit key: key flagsDominik Schürmann2014-08-055-16/+27
| |
| * Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵Dominik Schürmann2014-08-059-77/+101
| | | | | | | | selection for adding new subkeys
| * More work on add subkey dialog designDominik Schürmann2014-08-051-3/+6
| |
| * Work on add subkey dialog designDominik Schürmann2014-08-053-13/+39
| |
| * Better handling of user id revocation in UI codeDominik Schürmann2014-08-053-19/+70
| |
| * Create key: make single user id primary user id, other cleanupDominik Schürmann2014-08-053-6/+7
| |
| * Refactor expiry dialogDominik Schürmann2014-08-055-226/+291
| |
| * 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-059-34/+55
| |/
| * Add license headersDominik Schürmann2014-08-0419-0/+323
| |
| * Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
| |
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-046-13/+15
| |
| * More cleanupDominik Schürmann2014-08-041-3/+4
| |
| * Even more smaller nitpicksDominik Schürmann2014-08-041-12/+23
| |
| * 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-042-28/+23
| |
| * Remove old edit key stuffDominik Schürmann2014-08-043-1066/+0
| |
| * Edit key: subkey adding, not finishedDominik Schürmann2014-08-048-325/+123
| |
| * button language in encryptDominik Schürmann2014-08-041-1/+0
| |
| * 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-043-1/+10
| |/
| * Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0424-1091/+1668
| |\ | | | | | | Improve file encrypt
| | * Minor cleanupmar-v-in2014-08-022-2/+1
| | |
| | * Fix focusing with To fieldmar-v-in2014-08-022-3/+18
| | |
| | * Encrypt UI (drop downs)mar-v-in2014-08-014-21/+40
| | |
| | * 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-011-8/+14
| | |\
| | * | Fixes after mergemar-v-in2014-08-011-2/+5
| | | |
| | * | Merge branch 'master' into improve-file-moremar-v-in2014-08-0115-155/+200
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | |
| | * | | Fix mergemar-v-in2014-07-313-37/+19
| | | | |
| | * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-3168-2479/+3045
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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