aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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-0675-430/+2270
|\
| * encrypt to all encryption subkeys, rather than just the firstVincent Breitmoser2015-07-063-22/+27
| * catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown fr...Vincent Breitmoser2015-07-062-1/+8
| * fix PromoteKeyOperationTestVincent Breitmoser2015-07-061-11/+10
| * 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-057-33/+64
| * 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
| * Merge pull request #1329 from open-keychain/tor-supportDominik Schürmann2015-07-0454-225/+1959
| |\
| | * 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
| | * fixed orbot preference install dialogAdithya Abraham Philip2015-07-031-4/+4
| | * Rename package back to orbot because these are orbot utilsDominik Schürmann2015-07-0313-15/+12
| | * Cleanup tor codeDominik Schürmann2015-07-0313-42/+42
| | * Fix crash on settings by adding proxy fragment to isValidFragmentDominik Schürmann2015-07-031-0/+1
| | * added proxy logging, removed test function in KeybaseLibAdithya Abraham Philip2015-07-032-1/+2
| | * code cleanupAdithya Abraham Philip2015-07-033-5/+2
| | * added proxy support to YubiKey searchAdithya Abraham Philip2015-07-031-4/+28
| | * ensuring code style is preservedAdithya Abraham Philip2015-07-0323-146/+112
| | * removed openkeychain-test from settings.gradleAdithya Abraham Philip2015-07-031-1/+0
| | * added keyserver/proxy support to certify operationAdithya Abraham Philip2015-07-033-1/+14
| | * added proxy support to KeybaseLibAdithya Abraham Philip2015-07-035-14/+37
| | * added proxy support to keyserver verificationAdithya Abraham Philip2015-07-031-1/+1
| | * modify ImportKeysActivity to match new patternAdithya Abraham Philip2015-07-031-18/+4
| | * added proxy to all import operations using KeychainServiceAdithya Abraham Philip2015-07-038-21/+122
| | * added OperationResult support to upload to keyserverAdithya Abraham Philip2015-07-033-9/+23
| | * orbot dialog fragments addedAdithya Abraham Philip2015-07-0311-504/+738
| | * removed NetCipher submodule, copied classesAdithya Abraham Philip2015-07-034-6/+358
| | * fixed Proxy generation, proxy working for for cloud importAdithya Abraham Philip2015-07-037-42/+46
| | * added placeholder proxy to AddKeyServerAdithya Abraham Philip2015-07-032-7/+23
| | * fixed certificate pinningAdithya Abraham Philip2015-07-032-14/+41
| | * fixed prefsAdithya Abraham Philip2015-07-032-1/+13
| | * added proxy support, silent right nowAdithya Abraham Philip2015-07-0315-55/+250
| | * added ProxyPrefsAdithya Abraham Philip2015-07-032-3/+50
| | * added NetCipher as submoduleAdithya Abraham Philip2015-07-037-439/+8
| | * added proxy typeAdithya Abraham Philip2015-07-036-15/+75
| | * added class sourcesAdithya Abraham Philip2015-07-032-1/+9
| | * added licenseAdithya Abraham Philip2015-07-032-3/+66
| | * added proxy/tor preferencesAdithya Abraham Philip2015-07-038-1/+750
| |/
* | In NfcOperationsActivity, show NFC errors inline, in others show as NotifyDominik Schürmann2015-07-064-96/+157
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 16:06:21 +0000