Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Move encrypt decrypt operations in own starter activity | Dominik Schürmann | 2015-02-03 | 2 | -12/+29 | |
| | | | | ||||||
* | | | | More toolbar fixes | Dominik Schürmann | 2015-02-03 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Toolbar fixes, Toolbar under status bar on Lollipop | Dominik Schürmann | 2015-02-03 | 2 | -16/+19 | |
| | | | | ||||||
* | | | | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 1 | -31/+68 | |
| | | | | ||||||
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-02 | 68 | -821/+1024 | |
|\ \ \ \ | | | | | | | | | | | | | | | | development | |||||
| * | | | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 67 | -816/+1014 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | |||||
| * | | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-01-31 | 17 | -973/+985 | |
| |\ \ \ \ | ||||||
| * | | | | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 4 | -5/+10 | |
| | | | | | | ||||||
* | | | | | | UI experiments for app settings | Dominik Schürmann | 2015-02-02 | 2 | -11/+28 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Rename app setting classes for consistency | Dominik Schürmann | 2015-01-30 | 5 | -13/+12 | |
| | | | | | ||||||
* | | | | | Fix saving of allowed keys | Dominik Schürmann | 2015-01-30 | 1 | -11/+5 | |
| | | | | | ||||||
* | | | | | Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of ↵ | Dominik Schürmann | 2015-01-30 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 | |||||
| * | | | | | Add explicit casting to be able to compile with java8 | ligi | 2015-01-29 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 8 | -227/+454 | |
| | | | | | | ||||||
* | | | | | | Introduce allowed keys table per API client | Dominik Schürmann | 2015-01-29 | 4 | -5/+70 | |
| | | | | | | ||||||
* | | | | | | Header image tryout | Dominik Schürmann | 2015-01-29 | 1 | -2/+1 | |
|/ / / / / | ||||||
* | | | | | Remove files related to old nav drawer | Dominik Schürmann | 2015-01-29 | 3 | -324/+1 | |
| | | | | | ||||||
* | | | | | 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 | 4 | -131/+132 | |
|/ / / / | ||||||
* | | | | Move key list logic into fragment, UI fixes for nav drawer | Dominik Schürmann | 2015-01-29 | 10 | -302/+59 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 8 | -212/+362 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle | |||||
| * | | | | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 6 | -209/+196 | |
| | | | | | ||||||
* | | | | | Fix cleartext signatures internally | Dominik Schürmann | 2015-01-27 | 1 | -5/+4 | |
| | | | | | ||||||
* | | | | | Fix nullpointer in ImportKeysActivity | Dominik Schürmann | 2015-01-27 | 1 | -13/+24 | |
| | | | | | ||||||
* | | | | | Support verification of detached signatures | Dominik Schürmann | 2015-01-27 | 2 | -98/+223 | |
| | | | | | ||||||
* | | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 10 | -57/+131 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * \ \ \ \ | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-27 | 10 | -57/+132 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 6 | -4/+65 | |
| | | | | | | | ||||||
| | * | | | | | 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 | 4 | -41/+67 | |
| | | | | | | | ||||||
* | | | | | | | Temporary nav drawer fixes | Dominik Schürmann | 2015-01-27 | 5 | -18/+27 | |
| | | | | | | | ||||||
* | | | | | | | 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 | 112 | -1853/+2324 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | | | | | | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 6 | -29/+88 | |
| |/ / / / / | ||||||
| * | | | | | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 12 | -181/+136 | |
| | | | | | | ||||||
| * | | | | | 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 | 7 | -1/+201 | |
| | | | | | | ||||||
| * | | | | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 5 | -16/+112 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 2 | -1/+8 | |
| | | | | | | ||||||
| * | | | | | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 5 | -39/+56 | |
| | | | | | | ||||||
| * | | | | | 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 | 5 | -567/+25 | |
| | | | | | ||||||
| * | | | | Yubikey numkey by default to true | Dominik Schürmann | 2015-01-14 | 2 | -1/+4 | |
| | | | | | ||||||
| * | | | | Toolbar for settings | Dominik Schürmann | 2015-01-14 | 4 | -14/+41 | |
| | | | | | ||||||
| * | | | | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | due to security reasons |