Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 1 | -0/+36 |
|\ | | | | | Improve file encrypt | ||||
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 2 | -4/+10 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 1 | -0/+36 |
| | | | | | | | | | | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned. | ||||
* | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -26/+26 |
| | | | |||||
* | | | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 1 | -0/+179 |
| |/ |/| | |||||
* | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| | | | | | | | | methods | ||||
* | | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 1 | -3/+9 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| * | | modifyKey: error out on integrity check fails | Vincent Breitmoser | 2014-07-12 | 1 | -3/+9 |
| |/ | |||||
* / | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 |
|/ | |||||
* | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -121/+0 |
| | |||||
* | Changed license header | Daniel Haß | 2014-06-16 | 1 | -11/+11 |
| | |||||
* | Moved Notify class to utils | Daniel Haß | 2014-06-16 | 1 | -0/+70 |
| | |||||
* | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 2 | -529/+0 |
| | |||||
* | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 1 | -0/+57 |
| | |||||
* | JWalk javadocs | Tim Bray | 2014-05-14 | 1 | -0/+48 |
| | |||||
* | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 7 | -590/+8 |
| | |||||
* | ui: apply purple theme (twi is best color) | Vincent Breitmoser | 2014-05-06 | 1 | -1/+1 |
| | |||||
* | Fix license header | Dominik Schürmann | 2014-05-05 | 1 | -12/+11 |
| | |||||
* | Merge pull request #603 from timbray/master | Dominik Schürmann | 2014-05-05 | 4 | -16/+252 |
|\ | | | | | Adds first level of keybase support | ||||
| * | Per pull-request comments. | Tim Bray | 2014-05-04 | 4 | -34/+35 |
| | | |||||
| * | Changes should now be in sync with dominik | Tim Bray | 2014-04-30 | 1 | -4/+5 |
| | | |||||
| * | keybase ID stuff | Tim Bray | 2014-04-29 | 1 | -3/+8 |
| | | |||||
| * | Clean up debug crud | Tim Bray | 2014-04-29 | 1 | -1/+1 |
| | | |||||
| * | can search openkeychain, retrieve & install & use keys from there | Tim Bray | 2014-04-29 | 2 | -0/+229 |
| | | |||||
* | | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 2 | -0/+529 |
|/ | |||||
* | Rename ProgressDialogUpdater to Progressable | Thialfihar | 2014-04-29 | 1 | -5/+8 |
| | | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders. | ||||
* | Move util.ProgressDialogUpdater to pgp.Progressable | Thialfihar | 2014-04-29 | 1 | -26/+0 |
| | |||||
* | More code cleanup | Dominik Schürmann | 2014-04-19 | 1 | -1/+2 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 5 | -8/+20 |
| | |||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -5/+5 |
| | |||||
* | Remove unused blob classes and other dead code | Dominik Schürmann | 2014-04-13 | 1 | -94/+0 |
| | |||||
* | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 4 | -4/+4 |
| | |||||
* | display correct primary user id in import dialogue MOSTLY | Vincent Breitmoser | 2014-04-10 | 1 | -0/+1 |
| | | | | | | | | This is an incomplete fix; due to use of machine readable output, there is no way to know the primary user id for keys fetched from a key server. Pending https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index | ||||
* | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 6 | -54/+60 |
| | |||||
* | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 6 | -6/+6 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 16 | -0/+1638 |