Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Update api lib | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 | |
|/ / | ||||||
* | | Remove files related to old nav drawer | Dominik Schürmann | 2015-01-29 | 19 | -551/+53 | |
| | | ||||||
* | | Fix item layout in apps list | Dominik Schürmann | 2015-01-29 | 2 | -10/+10 | |
| | | ||||||
* | | Close FileDescriptors and input, output streams when possible | Dominik Schürmann | 2015-01-29 | 1 | -285/+335 | |
| | | ||||||
* | | Refactor DecryptActivity into DecryptOverviewFragment for nav drawer | Dominik Schürmann | 2015-01-29 | 9 | -278/+243 | |
| | | ||||||
* | | Update api lib | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 | |
| | | ||||||
* | | White popup theme | Dominik Schürmann | 2015-01-29 | 1 | -3/+7 | |
|/ | ||||||
* | Move key list logic into fragment, UI fixes for nav drawer | Dominik Schürmann | 2015-01-29 | 20 | -360/+61 | |
| | ||||||
* | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 11 | -214/+370 | |
|\ | | | | | | | | | Conflicts: OpenKeychain/build.gradle | |||||
| * | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 8 | -210/+198 | |
| | | ||||||
* | | Cloud search icon | Dominik Schürmann | 2015-01-28 | 10 | -3/+58 | |
| | | ||||||
* | | Fix cleartext signatures internally | Dominik Schürmann | 2015-01-27 | 1 | -5/+4 | |
| | | ||||||
* | | Update api lib | Dominik Schürmann | 2015-01-27 | 1 | -0/+0 | |
| | | ||||||
* | | Fix nullpointer in ImportKeysActivity | Dominik Schürmann | 2015-01-27 | 1 | -13/+24 | |
| | | ||||||
* | | Merge branch 'detached-sigs-api' into development | Dominik Schürmann | 2015-01-27 | 16 | -200/+449 | |
|\ \ | ||||||
| * | | Support verification of detached signatures | Dominik Schürmann | 2015-01-27 | 3 | -98/+223 | |
| | | | ||||||
| * | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 13 | -57/+187 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | | | Temporary nav drawer fixes | Dominik Schürmann | 2015-01-27 | 9 | -20/+54 | |
| | | | | ||||||
| * | | | Fixes for detached signatures | Dominik Schürmann | 2015-01-26 | 2 | -11/+36 | |
| | | | | ||||||
| * | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 652 | -3346/+5071 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | | | | Update safeslinger lib | Dominik Schürmann | 2015-01-12 | 1 | -0/+0 | |
| | | | | | ||||||
| * | | | | No output stream for detached signatures, makes no sense to pipe it through | Dominik Schürmann | 2015-01-08 | 2 | -2/+1 | |
| | | | | | ||||||
| * | | | | Experimental API support for detached signatures (not tested) | Dominik Schürmann | 2015-01-08 | 6 | -44/+118 | |
| | | | | | ||||||
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-27 | 1 | -0/+0 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | development | |||||
| * | | | | update openpgp-api-lib for charset support | Vincent Breitmoser | 2015-01-27 | 1 | -0/+0 | |
| | | | | | ||||||
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-27 | 12 | -57/+188 | |
|\| | | | | |_|/ / |/| | | | | | | | development | |||||
| * | | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 8 | -4/+120 | |
| | | | | ||||||
| * | | | remove unused NonPgpPartException | Vincent Breitmoser | 2015-01-26 | 1 | -12/+0 | |
| | | | | ||||||
| * | | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 5 | -41/+68 | |
| | | | | ||||||
* | | | | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 35 | -29/+101 | |
|/ / / | ||||||
* | | | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 57 | -273/+209 | |
| | | | ||||||
* | | | specify our usage of java 1.7 in build files | Vincent Breitmoser | 2015-01-25 | 1 | -0/+5 | |
| | | | ||||||
* | | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 88 | -838/+757 | |
| | | | ||||||
* | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 9 | -1/+334 | |
| | | | ||||||
* | | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 8 | -18/+165 | |
| | | | | | | | | | | | | | | | | | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | |||||
* | | | allow explicit re-certification in SaveKeyringParcel | Vincent Breitmoser | 2015-01-24 | 3 | -2/+10 | |
| | | | ||||||
* | | | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 7 | -41/+58 | |
| | | | ||||||
* | | | forgot another test case in prev. commit | Vincent Breitmoser | 2015-01-19 | 1 | -1/+2 | |
| | | | ||||||
* | | | fix unit test for new key flag behavior | Vincent Breitmoser | 2015-01-19 | 1 | -2/+2 | |
| | | | ||||||
* | | | only respect most recent signature for key flags | Vincent Breitmoser | 2015-01-19 | 2 | -12/+42 | |
| | | | ||||||
* | | | always show revoked user ids last! | Vincent Breitmoser | 2015-01-19 | 1 | -4/+4 | |
| | | | ||||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-19 | 2 | -1/+9 | |
|\ \ \ | | |/ | |/| | | | | development | |||||
| * | | No setContentView in onCreate for KeyListActivity | Vincent | 2015-01-16 | 1 | -2/+0 | |
| | | | ||||||
| * | | show notification if KeyListActivity is spawned with an EXTRA_RESULT | Vincent Breitmoser | 2015-01-16 | 2 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | Closes #1029 Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | |||||
* | | | Disable sharing chooser blacklisting for lollipop | Dominik Schürmann | 2015-01-19 | 3 | -3/+6 | |
|/ / | ||||||
* | | Style tabs, add missing drawables | Dominik Schürmann | 2015-01-15 | 22 | -573/+43 | |
| | | ||||||
* | | Fix drawable sizes | Dominik Schürmann | 2015-01-14 | 20 | -3/+3 | |
| | | ||||||
* | | Yubikey numkey by default to true | Dominik Schürmann | 2015-01-14 | 2 | -1/+4 | |
| | | ||||||
* | | Toolbar for settings | Dominik Schürmann | 2015-01-14 | 14 | -20/+58 | |
| | | ||||||
* | | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 5 | -6/+17 | |
| | | | | | | | | due to security reasons |