Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 8 | -1262/+0 |
| | |||||
* | Optimize comments, remove dead code | Dominik Schürmann | 2014-04-06 | 6 | -47/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 1 | -2/+16 |
|\ | |||||
| * | Simplify PassphraseDialogFragment usage | Thialfihar | 2014-04-04 | 1 | -2/+16 |
| | | | | | | | | | | Move boiler plate code into a simple static show() method, which only requires a Handler and can be used ad hoc in any FragmentActivity. | ||||
* | | more work on streamlining uris, and stripping ProviderHelper | Vincent Breitmoser | 2014-04-03 | 1 | -3/+3 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-03 | 4 | -6/+27 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | Rearrange too long lines | Thialfihar | 2014-04-02 | 1 | -1/+2 |
| | | |||||
| * | Trivial spacing changes to conform to style guide | Thialfihar | 2014-04-02 | 1 | -1/+1 |
| | | |||||
| * | Adjust import order | Thialfihar | 2014-04-02 | 2 | -4/+0 |
| | | |||||
| * | Automatically select newly created key in api accounts | Dominik Schürmann | 2014-04-01 | 1 | -2/+27 |
|/ | |||||
* | Remove cancel from app menu | Dominik Schürmann | 2014-03-30 | 1 | -3/+0 |
| | |||||
* | Revert "Remove cancel from app menu" | Dominik Schürmann | 2014-03-30 | 1 | -0/+3 |
| | | | | This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4. | ||||
* | Remove cancel from app menu | Dominik Schürmann | 2014-03-30 | 1 | -3/+0 |
| | |||||
* | Rename layouts for remote activity | Dominik Schürmann | 2014-03-26 | 1 | -4/+4 |
| | |||||
* | Accounts list prettified | Dominik Schürmann | 2014-03-26 | 2 | -1/+27 |
| | |||||
* | Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT | Dominik Schürmann | 2014-03-26 | 2 | -26/+22 |
| | |||||
* | Forgot resource | Dominik Schürmann | 2014-03-26 | 1 | -12/+0 |
| | |||||
* | Part 2 of basic user interface for api accounts | Dominik Schürmann | 2014-03-26 | 2 | -55/+41 |
| | |||||
* | Accounts API, user interface | Dominik Schürmann | 2014-03-26 | 4 | -91/+194 |
| | |||||
* | Return account creation intent if account does not exists in db | Dominik Schürmann | 2014-03-25 | 1 | -3/+3 |
| | |||||
* | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 3 | -26/+80 |
| | |||||
* | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 7 | -180/+498 |
| | |||||
* | Move classes for OpenPGP API into remote package | Dominik Schürmann | 2014-03-23 | 6 | -0/+801 |