Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-08-28 | 1 | -1/+3 |
|\ | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-08-27 | 1 | -2/+10 |
| |\ | |||||
| * | | use nicer filenames during export | Vincent Breitmoser | 2015-08-27 | 1 | -1/+3 |
| | | | |||||
* | | | Collapsing Toolbar | Dominik Schürmann | 2015-08-28 | 1 | -35/+32 |
| |/ |/| | |||||
* | | Experimental word comparison | Dominik Schürmann | 2015-08-27 | 1 | -2/+10 |
|/ | |||||
* | Fix key view toolbar and status colour | Thialfihar | 2015-07-21 | 1 | -4/+24 |
| | | | | | | The status bar wrongly used the same colour as the toolbar, making it indistinguishable from it. This calculates the status bar colour based on the toolbar colour. | ||||
* | Fix drawer background color for ViewKeyActivity | Thialfihar | 2015-07-21 | 1 | -2/+2 |
| | |||||
* | Give key flag colors their own color names | Thialfihar | 2015-07-21 | 1 | -4/+4 |
| | | | | | This removes "bg_gray" and selector_transparent_button.xml, which is unused and the last file to reference "bg_gray". | ||||
* | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 1 | -3/+2 |
| | |||||
* | use only one DeleteDialogActivity | Adithya Abraham Philip | 2015-07-13 | 1 | -18/+10 |
| | |||||
* | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 1 | -23/+27 |
| | |||||
* | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -2/+2 |
| | |||||
* | change wording of export dialog, remove "export secret" checkbox | Vincent Breitmoser | 2015-07-08 | 1 | -21/+7 |
| | |||||
* | Do not ask for passphrase on delete | Dominik Schürmann | 2015-07-08 | 1 | -9/+3 |
| | |||||
* | Rudimentary backup feature | Dominik Schürmann | 2015-07-08 | 1 | -0/+2 |
| | |||||
* | try cache in certify operation (fixes #1242) | Vincent Breitmoser | 2015-07-07 | 1 | -61/+45 |
| | |||||
* | fix passphrase->deletion ui flow for secret keys, and disregard cache | Vincent Breitmoser | 2015-07-07 | 1 | -38/+24 |
| | |||||
* | fix handling of progress dialog creation in CryptoOperationFragment (fixes ↵ | Vincent Breitmoser | 2015-07-07 | 1 | -33/+32 |
| | | | | #1407) | ||||
* | don't cache exporthelper, keep type for KeyItem in KeySpinner | Vincent Breitmoser | 2015-07-06 | 1 | -9/+5 |
| | |||||
* | Rename package back to orbot because these are orbot utils | Dominik Schürmann | 2015-07-03 | 1 | -1/+1 |
| | |||||
* | Cleanup tor code | Dominik Schürmann | 2015-07-03 | 1 | -1/+1 |
| | |||||
* | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 1 | -8/+15 |
| | |||||
* | added proxy to all import operations using KeychainService | Adithya Abraham Philip | 2015-07-03 | 1 | -5/+1 |
| | |||||
* | New NFC dialog design with indeterminate progress, do NFC stuff in background | Dominik Schürmann | 2015-07-03 | 1 | -13/+20 |
| | |||||
* | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+5 |
| | |||||
* | renamed KeychainNewService to KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+2 |
| | |||||
* | deleted KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -3/+2 |
| | |||||
* | migrated import to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -43/+44 |
| | |||||
* | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -3/+0 |
| | |||||
* | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 1 | -10/+10 |
| | |||||
* | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -0/+2 |
| | |||||
* | Use Mode.ALPHANUMERIC for QR codes to save space | Dominik Schürmann | 2015-05-19 | 1 | -2/+5 |
| | |||||
* | load yubikey fragment after mMasterKeyId is available | Vincent Breitmoser | 2015-05-17 | 1 | -17/+33 |
| | |||||
* | pass masterKeyId to yubikey fragment | Vincent Breitmoser | 2015-05-16 | 1 | -1/+1 |
| | |||||
* | allow state loss when yubikey fragment is loaded | Vincent Breitmoser | 2015-05-16 | 1 | -1/+2 |
| | |||||
* | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -39/+45 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -28/+12 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -4/+4 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -4/+4 |
| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
* | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 1 | -2/+2 |
| | | |||||
* | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -1/+19 |
| | | |||||
* | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 1 | -4/+79 |
| | | |||||
* | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 1 | -0/+1 |
|/ | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | ||||
* | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -5/+5 |
| | |||||
* | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 1 | -152/+17 |
| | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement) | ||||
* | Fixed a crash on ViewKeyActivity | Manoj Khanna | 2015-03-19 | 1 | -40/+51 |
| | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity. | ||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -3/+3 |
| | |||||
* | Use notify instead of Toast for NFC check | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1133 from Rrego6/development | Dominik Schürmann | 2015-03-12 | 1 | -0/+6 |
|\ | | | | | Check if NFC is available on device |