aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-091-1/+0
|\
| * Fix compression check in activitiesDominik Schürmann2015-03-091-1/+0
* | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
|/
* Redesign of encrypt activites finishedDominik Schürmann2015-03-091-0/+33
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-14/+22
* Temporary nav drawer fixesDominik Schürmann2015-01-271-1/+1
* Material Design DrawerDominik Schürmann2015-01-261-1/+1
* move around package structure a bitVincent Breitmoser2014-10-101-1/+1
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-301-2/+3
* Fix NfcActivity task stack problemDominik Schürmann2014-09-291-1/+0
* move more stuff into EncryptActivity superclassVincent Breitmoser2014-09-241-1/+112
* Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ...Dominik Schürmann2014-09-241-4/+0
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-241-10/+1
|\
| * Yubikey decryptionDominik Schürmann2014-09-241-4/+1
| * Implement buttons in DecryptTextFragmentDominik Schürmann2014-09-231-7/+0
* | fix signing in OK with yubikeysVincent Breitmoser2014-09-241-1/+3
|/
* Passphrase handling in encryptDominik Schürmann2014-09-171-12/+18
* Result parcel refactorings (WIP)Dominik Schürmann2014-09-171-0/+37
* split EncryptActivity into Encrypt{Text,File}ActivityVincent Breitmoser2014-09-011-626/+0
* Add info about device with intent chooser bugDominik Schürmann2014-08-211-1/+1
* Disable custom intent chooserDominik Schürmann2014-08-211-53/+54
* Fix mime types, #781mar-v-in2014-08-191-1/+1
* Remove NoSwipeWrapContentViewPagermar-v-in2014-08-171-21/+20
* Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-131-11/+15
* remove bundle for symmetric/asymmetric fragment as it was uselessmar-v-in2014-08-131-13/+5
* fix message and uri from encrypt intentmar-v-in2014-08-131-8/+4
* Support mime type in metadataDominik Schürmann2014-08-111-1/+0
* Get original filename for decryptionDominik Schürmann2014-08-111-5/+4
* Fix compression setting for encryption of filesDominik Schürmann2014-08-101-4/+7
* More cleanupDominik Schürmann2014-08-041-3/+4
* Even more smaller nitpicksDominik Schürmann2014-08-041-12/+23
* Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-041-2/+74
* Smaller UI fixesDominik Schürmann2014-08-041-1/+1
* Minor cleanupmar-v-in2014-08-021-1/+0
* Encrypt UI (drop downs)mar-v-in2014-08-011-2/+1
* Fix string resourcesmar-v-in2014-07-311-1/+1
* Fix mergemar-v-in2014-07-311-13/+17
* - add multi select for storage api (kitkat)mar-v-in2014-07-311-10/+12
* Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-201-34/+272
* Merge branch 'master' into improve-file-moremar-v-in2014-07-061-1/+1
|\
| * Remove unnecessary error logsDominik Schürmann2014-07-021-1/+1
* | Many changes to file ... and still incompletemar-v-in2014-07-061-9/+68
* | Encrypt/Decrypt UI workmar-v-in2014-07-021-0/+11
* | Improve file more, Part 1mar-v-in2014-06-221-25/+4
|/
* Better handling of actionbars backDominik Schürmann2014-05-071-14/+16
* More code cleanupDominik Schürmann2014-04-191-1/+1
* Removing remaining uses of Id, closing one of the oldest bugs #9Dominik Schürmann2014-04-141-2/+1
* Change license from ASLv2 to GPLv3 where possibleThialfihar2014-04-081-9/+10
* Update copyright timespan for ThialfiharThialfihar2014-04-081-1/+1
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+256