| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | pass key id for check from EncryptActivity to NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -2/+3 |
| | | |||||
| * | Fix NfcActivity task stack problem | Dominik Schürmann | 2014-09-29 | 1 | -1/+0 |
| | | |||||
| * | move more stuff into EncryptActivity superclass | Vincent Breitmoser | 2014-09-24 | 1 | -1/+112 |
| | | |||||
| * | Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵ | Dominik Schürmann | 2014-09-24 | 1 | -4/+0 |
| | | | | | need to separate | ||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-24 | 1 | -10/+1 |
| |\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | ||||
| | * | Yubikey decryption | Dominik Schürmann | 2014-09-24 | 1 | -4/+1 |
| | | | |||||
| | * | Implement buttons in DecryptTextFragment | Dominik Schürmann | 2014-09-23 | 1 | -7/+0 |
| | | | |||||
| * | | fix signing in OK with yubikeys | Vincent Breitmoser | 2014-09-24 | 1 | -1/+3 |
| |/ | |||||
| * | Passphrase handling in encrypt | Dominik Schürmann | 2014-09-17 | 1 | -12/+18 |
| | | |||||
| * | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -0/+37 |
| | | |||||
| * | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 1 | -626/+0 |
| | | |||||
| * | Add info about device with intent chooser bug | Dominik Schürmann | 2014-08-21 | 1 | -1/+1 |
| | | |||||
| * | Disable custom intent chooser | Dominik Schürmann | 2014-08-21 | 1 | -53/+54 |
| | | |||||
| * | Fix mime types, #781 | mar-v-in | 2014-08-19 | 1 | -1/+1 |
| | | |||||
| * | Remove NoSwipeWrapContentViewPager | mar-v-in | 2014-08-17 | 1 | -21/+20 |
| | | |||||
| * | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 1 | -11/+15 |
| | | |||||
| * | remove bundle for symmetric/asymmetric fragment as it was useless | mar-v-in | 2014-08-13 | 1 | -13/+5 |
| | | |||||
| * | fix message and uri from encrypt intent | mar-v-in | 2014-08-13 | 1 | -8/+4 |
| | | |||||
| * | Support mime type in metadata | Dominik Schürmann | 2014-08-11 | 1 | -1/+0 |
| | | |||||
| * | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 1 | -5/+4 |
| | | |||||
| * | Fix compression setting for encryption of files | Dominik Schürmann | 2014-08-10 | 1 | -4/+7 |
| | | |||||
| * | More cleanup | Dominik Schürmann | 2014-08-04 | 1 | -3/+4 |
| | | |||||
| * | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -12/+23 |
| | | |||||
| * | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -2/+74 |
| | | |||||
| * | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 |
| | | |||||
| * | Minor cleanup | mar-v-in | 2014-08-02 | 1 | -1/+0 |
| | | |||||
| * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 1 | -2/+1 |
| | | |||||
| * | Fix string resources | mar-v-in | 2014-07-31 | 1 | -1/+1 |
| | | |||||
| * | Fix merge | mar-v-in | 2014-07-31 | 1 | -13/+17 |
| | | |||||
| * | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 1 | -10/+12 |
| | | | | | | - UI fixes - refactoring | ||||
| * | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 1 | -34/+272 |
| | | |||||
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Remove unnecessary error logs | Dominik Schürmann | 2014-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 1 | -9/+68 |
| | | | | | | | | | | | - Multi file - Reworked UI | ||||
| * | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 1 | -0/+11 |
| | | | |||||
| * | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -25/+4 |
| |/ | | | | | | | | | | | | | | | - 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) | ||||
| * | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 1 | -14/+16 |
| | | |||||
| * | More code cleanup | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 |
| | | |||||
| * | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -2/+1 |
| | | |||||
| * | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 1 | -9/+10 |
| | | |||||
| * | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 1 | -1/+1 |
| | | |||||
| * | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+256 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |