Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-09 | 1 | -0/+64 |
|\ | |||||
| * | make openInputStreamSafe static and move to FileHelper | Vincent Breitmoser | 2015-10-09 | 1 | -9/+74 |
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 1 | -104/+0 |
|\| | |||||
| * | Remove ShareHelper: Not compat with Android >= 5, reduce code complexity | Dominik Schürmann | 2015-10-08 | 1 | -104/+0 |
* | | use annotations for android sdk constraints | Vincent Breitmoser | 2015-09-28 | 1 | -33/+25 |
* | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 7 | -138/+146 |
|\| | |||||
| * | Harden parsing of keyserver results (OKC-01-003) | Dominik Schürmann | 2015-09-25 | 1 | -2/+1 |
| * | Cleanup FileHelper | Dominik Schürmann | 2015-09-24 | 1 | -11/+10 |
| * | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 2 | -71/+9 |
| * | Fix some illegal state exceptions | Dominik Schürmann | 2015-09-24 | 1 | -0/+4 |
| * | Pin keybase certificate | Dominik Schürmann | 2015-09-21 | 1 | -20/+25 |
| * | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 2 | -0/+91 |
| * | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ... | Dominik Schürmann | 2015-09-20 | 1 | -55/+27 |
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 1 | -1/+1 |
* | | remove "export to file" code path from export operation | Vincent Breitmoser | 2015-09-26 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -0/+76 |
|\ | |||||
| * | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 1 | -1/+48 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 1 | -0/+5 |
| |\ \ | |||||
| * \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 9 | -123/+185 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 2 | -8/+17 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 4 | -32/+393 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 2 | -37/+261 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 1 | -6/+48 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 1 | -0/+76 |
* | | | | | | | | | Make keybase an experimental feature | Dominik Schürmann | 2015-08-28 | 1 | -0/+10 |
* | | | | | | | | | some cleanup in FileHelper, and allow input of filename during export | Vincent Breitmoser | 2015-08-27 | 2 | -82/+117 |
* | | | | | | | | | Experimental features settings reworked | Dominik Schürmann | 2015-08-27 | 1 | -6/+15 |
* | | | | | | | | | Experimental feature setting | Dominik Schürmann | 2015-08-27 | 1 | -1/+13 |
* | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-08-24 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | trigger indexing of file after operation (#1498) | Vincent Breitmoser | 2015-08-22 | 1 | -1/+6 |
* | | | | | | | | | | Move proxy pref values out of strings | Dominik Schürmann | 2015-08-24 | 1 | -7/+10 |
|/ / / / / / / / / | |||||
* | | | | | | | | | introduced constants for keyserver sync, fixed sync issue | Adithya Abraham Philip | 2015-08-20 | 2 | -3/+8 |
* | | | | | | | | | reworked keyserversyncadapterservice flow | Adithya Abraham Philip | 2015-08-20 | 1 | -12/+24 |
* | | | | | | | | | Lock orientation for yubikey operations | Dominik Schürmann | 2015-08-12 | 1 | -0/+85 |
* | | | | | | | | | updated OrbotHelper with silent start | Adithya Abraham Philip | 2015-08-06 | 3 | -79/+293 |
* | | | | | | | | | Fix preference version handling | Thialfihar | 2015-07-21 | 1 | -2/+2 |
* | | | | | | | | | Use a constant for the default value of the theme | Thialfihar | 2015-07-21 | 1 | -1/+1 |
* | | | | | | | | | Rename updatePreferences() to upgradePreferences() | Thialfihar | 2015-07-21 | 1 | -1/+1 |
* | | | | | | | | | Refactor theme preference values into constants | Thialfihar | 2015-07-21 | 1 | -1/+5 |
* | | | | | | | | | Add theme setting | Thialfihar | 2015-07-21 | 1 | -0/+9 |
* | | | | | | | | | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -1/+1 |
* | | | | | | | | | change wording of export dialog, remove "export secret" checkbox | Vincent Breitmoser | 2015-07-08 | 1 | -16/+22 |
* | | | | | | | | | Rudimentary backup feature | Dominik Schürmann | 2015-07-08 | 1 | -2/+2 |
* | | | | | | | | | shifted proxy checking to ImportKeysListCloudLoader | Adithya Abraham Philip | 2015-07-08 | 1 | -0/+30 |
* | | | | | | | | | fixed OrbotRequiredDialogActivity not finishing, orbot install dialog style | Adithya Abraham Philip | 2015-07-03 | 1 | -8/+44 |
* | | | | | | | | | reformatted code | Adithya Abraham Philip | 2015-07-03 | 2 | -3/+6 |
* | | | | | | | | | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 3 | -37/+36 |
* | | | | | | | | | fixed middleButton parameter being ignored | Adithya Abraham Philip | 2015-07-03 | 1 | -2/+2 |
* | | | | | | | | | renamed to clarify necessity for two install dialog fragments | Adithya Abraham Philip | 2015-07-03 | 1 | -3/+3 |
* | | | | | | | | | Rename package back to orbot because these are orbot utils | Dominik Schürmann | 2015-07-03 | 2 | -2/+2 |