Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Better YubiKey UX flow for error handling | Dominik Schürmann | 2015-07-06 | 2 | -9/+43 |
| | |||||
* | Poll if yubikey has been taken away | Dominik Schürmann | 2015-07-06 | 2 | -9/+14 |
| | |||||
* | Fix account key selection for API | Dominik Schürmann | 2015-07-06 | 1 | -1/+6 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-06 | 32 | -164/+1083 |
|\ | |||||
| * | forgot a couple lines to commit | Vincent Breitmoser | 2015-07-06 | 1 | -2/+6 |
| | | |||||
| * | cleanup, NonNull annotation, never return null in PgpDecryptVerify | Vincent Breitmoser | 2015-07-06 | 1 | -10/+7 |
| | | |||||
| * | some cleanup and documentation | Vincent Breitmoser | 2015-07-06 | 4 | -45/+57 |
| | | |||||
| * | make sure clipboard service retrieval is always null-proof | Vincent Breitmoser | 2015-07-05 | 4 | -15/+51 |
| | | |||||
| * | don't show notification in MainActivity when state is restored | Vincent Breitmoser | 2015-07-05 | 1 | -14/+17 |
| | | |||||
| * | better getActivity and getSystemService null handling in encryptfilesfragment | Vincent Breitmoser | 2015-07-05 | 1 | -9/+20 |
| | | |||||
| * | set data for query intent (fix #1389) | Vincent Breitmoser | 2015-07-05 | 1 | -1/+1 |
| | | |||||
| * | fixed OrbotRequiredDialogActivity not finishing, orbot install dialog style | Adithya Abraham Philip | 2015-07-03 | 7 | -36/+68 |
| | | |||||
| * | reformatted code | Adithya Abraham Philip | 2015-07-03 | 5 | -8/+13 |
| | | |||||
| * | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 13 | -74/+158 |
| | | |||||
| * | renamed to clarify necessity for two install dialog fragments | Adithya Abraham Philip | 2015-07-03 | 1 | -4/+4 |
| | | |||||
| * | reduce code duplication | Adithya Abraham Philip | 2015-07-03 | 3 | -150/+119 |
| | | |||||
| * | removed e.printStackTrace from several places | Adithya Abraham Philip | 2015-07-03 | 2 | -3/+7 |
| | | |||||
| * | fixed orbot preference install dialog | Adithya Abraham Philip | 2015-07-03 | 1 | -4/+4 |
| | | |||||
| * | Rename package back to orbot because these are orbot utils | Dominik Schürmann | 2015-07-03 | 11 | -13/+10 |
| | | |||||
| * | Cleanup tor code | Dominik Schürmann | 2015-07-03 | 11 | -16/+27 |
| | | |||||
| * | Fix crash on settings by adding proxy fragment to isValidFragment | Dominik Schürmann | 2015-07-03 | 1 | -0/+1 |
| | | |||||
| * | code cleanup | Adithya Abraham Philip | 2015-07-03 | 2 | -3/+1 |
| | | |||||
| * | added proxy support to YubiKey search | Adithya Abraham Philip | 2015-07-03 | 1 | -4/+28 |
| | | |||||
| * | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 11 | -44/+49 |
| | | |||||
| * | added keyserver/proxy support to certify operation | Adithya Abraham Philip | 2015-07-03 | 1 | -0/+5 |
| | | |||||
| * | added proxy support to KeybaseLib | Adithya Abraham Philip | 2015-07-03 | 2 | -6/+27 |
| | | |||||
| * | added proxy support to keyserver verification | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+1 |
| | | |||||
| * | modify ImportKeysActivity to match new pattern | Adithya Abraham Philip | 2015-07-03 | 1 | -18/+4 |
| | | |||||
| * | added proxy to all import operations using KeychainService | Adithya Abraham Philip | 2015-07-03 | 6 | -21/+72 |
| | | |||||
| * | orbot dialog fragments added | Adithya Abraham Philip | 2015-07-03 | 5 | -276/+568 |
| | | |||||
| * | fixed Proxy generation, proxy working for for cloud import | Adithya Abraham Philip | 2015-07-03 | 4 | -9/+22 |
| | | |||||
| * | added placeholder proxy to AddKeyServer | Adithya Abraham Philip | 2015-07-03 | 2 | -7/+23 |
| | | |||||
| * | fixed prefs | Adithya Abraham Philip | 2015-07-03 | 1 | -0/+3 |
| | | |||||
| * | added proxy support, silent right now | Adithya Abraham Philip | 2015-07-03 | 4 | -8/+46 |
| | | |||||
| * | added NetCipher as submodule | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+1 |
| | | |||||
| * | added proxy type | Adithya Abraham Philip | 2015-07-03 | 1 | -2/+20 |
| | | |||||
| * | added proxy/tor preferences | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+284 |
| | | |||||
* | | In NfcOperationsActivity, show NFC errors inline, in others show as Notify | Dominik Schürmann | 2015-07-06 | 3 | -95/+117 |
|/ | |||||
* | New NFC dialog design with indeterminate progress, do NFC stuff in background | Dominik Schürmann | 2015-07-03 | 6 | -73/+172 |
| | |||||
* | Fix caching of empty passphrase before moving keys to card | Dominik Schürmann | 2015-07-03 | 2 | -7/+8 |
| | |||||
* | Better keyboard layout for PINs | Dominik Schürmann | 2015-07-02 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-02 | 3 | -17/+49 |
|\ | |||||
| * | Merge pull request #1387 from ishit/master | Dominik Schürmann | 2015-07-02 | 2 | -15/+43 |
| |\ | | | | | | | Add visual element to verify the re-typed password. Refer #1357. | ||||
| | * | Change PassphraseEditAgain status icons. | Ishit | 2015-07-02 | 2 | -4/+4 |
| | | | |||||
| | * | Fix for #1357 | Ishit | 2015-07-01 | 1 | -13/+41 |
| | | | |||||
| * | | prevent deletion of last keyserver in preference | Adithya Abraham Philip | 2015-07-02 | 1 | -2/+6 |
| | | | |||||
| * | | correct keyserver preference retrieval | Adithya Abraham Philip | 2015-07-02 | 1 | -1/+1 |
| | | | |||||
* | | | Disable move to card from edit screen | Dominik Schürmann | 2015-07-02 | 2 | -39/+45 |
| | | | |||||
* | | | Change PIN and Admin PIN after move to key operation | Dominik Schürmann | 2015-07-02 | 7 | -47/+73 |
|/ / | |||||
* | | fix CryptoOperationFragment infinite recursion | Adithya Abraham Philip | 2015-07-02 | 1 | -1/+1 |
| | |