aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * (missed a couple files in last commit)Vincent Breitmoser2015-07-082-6/+10
| |
| * use QueueingCryptoOperationFragment in all other placesVincent Breitmoser2015-07-075-22/+38
| |
| * introduce QueueingCryptoOperationFragment to queue result handling in ↵Vincent Breitmoser2015-07-075-13/+87
| | | | | | | | detached state
| * try cache in certify operation (fixes #1242)Vincent Breitmoser2015-07-075-74/+61
| |
| * move queued action handling from prev commit into onActivityCreatedVincent Breitmoser2015-07-071-31/+27
| |
* | Temporary fix for multi exportDominik Schürmann2015-07-082-24/+31
| |
* | Clarifications in remote API codeDominik Schürmann2015-07-073-21/+21
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-071-37/+90
|\
| * handle getActivity() by queueing results in CreateKeyFinalFragmentVincent Breitmoser2015-07-071-37/+90
| |
* | Package cert not sigDominik Schürmann2015-07-0722-40/+40
|/
* linked proxy settings to other proxy checkboxAdithya Abraham Philip2015-07-071-7/+22
|
* fix passphrase->deletion ui flow for secret keys, and disregard cacheVincent Breitmoser2015-07-071-38/+24
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-079-68/+61
|\
| * fix some nullpointers from proxy implementationVincent Breitmoser2015-07-072-3/+8
| |
| * fix handling of progress dialog creation in CryptoOperationFragment (fixes ↵Vincent Breitmoser2015-07-076-64/+52
| | | | | | | | #1407)
| * tests: make sure encryption happens to all enc-capable subkeysVincent Breitmoser2015-07-071-1/+1
| |
* | strings: digits instead of numbersDominik Schürmann2015-07-071-1/+1
| |
* | Simplify getLineSeparator in PgpDecryptVerifyDominik Schürmann2015-07-071-7/+1
|/
* actually disable non-enabled items in keyspinner (in keyadapter) (fixes #1366)Vincent Breitmoser2015-07-063-15/+34
|
* Pull from transifexDominik Schürmann2015-07-0657-220/+759
|
* Changelog 3.4Dominik Schürmann2015-07-061-0/+5
|
* Disable YubiKey creationDominik Schürmann2015-07-061-6/+15
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-061-2/+3
|\
| * also catch DecoderException in decryptverifyVincent Breitmoser2015-07-061-2/+3
| |
* | Better error string for too short PINDominik Schürmann2015-07-061-9/+9
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-063-21/+17
|\
| * don't cache exporthelper, keep type for KeyItem in KeySpinnerVincent Breitmoser2015-07-063-21/+17
| |
* | Save mTagHandlingEnabled in saved instanceDominik Schürmann2015-07-061-1/+16
|/
* Better YubiKey UX flow for error handlingDominik Schürmann2015-07-064-42/+103
|
* Change signed by to sign withDominik Schürmann2015-07-061-1/+1
|
* Poll if yubikey has been taken awayDominik Schürmann2015-07-062-9/+14
|
* Fix account key selection for APIDominik Schürmann2015-07-061-1/+6
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-0671-414/+2255
|\
| * encrypt to all encryption subkeys, rather than just the firstVincent Breitmoser2015-07-063-22/+27
| |
| * catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown ↵Vincent Breitmoser2015-07-062-1/+8
| | | | | | | | from BouncyCastle
| * forgot a couple lines to commitVincent Breitmoser2015-07-062-2/+16
| |
| * nicer error msg if input data cannot be readVincent Breitmoser2015-07-063-3/+5
| |
| * cleanup, NonNull annotation, never return null in PgpDecryptVerifyVincent Breitmoser2015-07-0613-74/+92
| |
| * some cleanup and documentationVincent Breitmoser2015-07-065-46/+61
| |
| * make sure clipboard service retrieval is always null-proofVincent Breitmoser2015-07-056-28/+60
| |
| * don't show notification in MainActivity when state is restoredVincent Breitmoser2015-07-051-14/+17
| |
| * better getActivity and getSystemService null handling in encryptfilesfragmentVincent Breitmoser2015-07-052-9/+21
| |
| * set data for query intent (fix #1389)Vincent Breitmoser2015-07-051-1/+1
| |
| * fixed OrbotRequiredDialogActivity not finishing, orbot install dialog styleAdithya Abraham Philip2015-07-038-44/+112
| |
| * reformatted codeAdithya Abraham Philip2015-07-038-17/+24
| |
| * added proxy support to OperationHelperAdithya Abraham Philip2015-07-0328-161/+388
| |
| * fixed middleButton parameter being ignoredAdithya Abraham Philip2015-07-031-2/+2
| |
| * renamed to clarify necessity for two install dialog fragmentsAdithya Abraham Philip2015-07-032-7/+7
| |
| * reduce code duplicationAdithya Abraham Philip2015-07-033-150/+119
| |
| * removed e.printStackTrace from several placesAdithya Abraham Philip2015-07-035-8/+13
| |