Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Even better Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -8/+10 |
* | Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 2 | -6/+14 |
* | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 3 | -6/+4 |
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 21 | -209/+193 |
* | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 9 | -47/+27 |
* | More file association hacks for AndroidManifest and key import | Dominik Schürmann | 2014-07-31 | 3 | -17/+181 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 3 | -23/+15 |
|\ | |||||
| * | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 3 | -23/+15 |
* | | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 8 | -192/+242 |
|/ | |||||
* | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 5 | -11/+46 |
* | Create key: upload | Dominik Schürmann | 2014-07-30 | 2 | -13/+22 |
* | Fix drawer in key list | Dominik Schürmann | 2014-07-30 | 1 | -4/+4 |
* | return values for create key | Dominik Schürmann | 2014-07-30 | 3 | -8/+22 |
* | Create key: layout above buttons | Dominik Schürmann | 2014-07-30 | 2 | -4/+8 |
* | Fix conflicts | Dominik Schürmann | 2014-07-30 | 2 | -3/+25 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 42 | -1024/+332 |
|\ | |||||
| * | fix a couple remaining AppMsgs | Vincent Breitmoser | 2014-07-29 | 2 | -10/+7 |
| * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 36 | -996/+309 |
| |\ | |||||
| | * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 14 | -52/+100 |
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 15 | -120/+87 |
| | * | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 60 | -1462/+1696 |
| | |\ | |||||
| | * | | use SuperToast instead of AppMsg in code, part 2 | Vincent Breitmoser | 2014-07-07 | 2 | -3/+64 |
| | * | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 17 | -112/+82 |
| | * | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 3 | -745/+1 |
| * | | | watch out for nullpointers from get(Un|)HashedSubpackets | Vincent Breitmoser | 2014-07-28 | 3 | -10/+19 |
* | | | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 14 | -297/+733 |
|/ / / | |||||
* | | | Fix build by removing old icon reference | Dominik Schürmann | 2014-07-28 | 1 | -1/+0 |
* | | | Use new icons in other key related activites, delete old icons | Dominik Schürmann | 2014-07-28 | 35 | -53/+77 |
* | | | Use verified icon for certify action | Dominik Schürmann | 2014-07-28 | 2 | -13/+52 |
* | | | Set visibility at last | Dominik Schürmann | 2014-07-28 | 2 | -6/+6 |
* | | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 5 | -43/+64 |
* | | | Use new status icons in key list | Dominik Schürmann | 2014-07-28 | 2 | -44/+29 |
* | | | Smaller status images, green test | Dominik Schürmann | 2014-07-28 | 61 | -1/+1 |
* | | | Fix resource names, add small test | Dominik Schürmann | 2014-07-28 | 62 | -7/+12 |
* | | | Add icons from ModernPGP project | Dominik Schürmann | 2014-07-28 | 60 | -0/+0 |
* | | | Fix background color of notify area | Dominik Schürmann | 2014-07-27 | 1 | -2/+0 |
* | | | cleanup left-overs | Dominik Schürmann | 2014-07-27 | 1 | -2/+0 |
* | | | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 8 | -134/+170 |
* | | | Load QR Code asynchronously and with a fade in animation | Dominik Schürmann | 2014-07-27 | 1 | -5/+41 |
* | | | Open keyboard on passphrase dialog, this should now work on all Android versi... | Dominik Schürmann | 2014-07-27 | 4 | -44/+109 |
* | | | Make PassphraseCacheService a foreground service | Dominik Schürmann | 2014-07-27 | 1 | -72/+67 |
* | | | Prettify buttons | Dominik Schürmann | 2014-07-27 | 2 | -41/+76 |
* | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 10 | -107/+215 |
| |/ |/| | |||||
* | | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 2 | -18/+30 |
* | | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 |
* | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-26 | 4 | -43/+48 |
|\ \ | |||||
| * | | Program flow fixes | Dominik Schürmann | 2014-07-25 | 4 | -43/+48 |
* | | | UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings | Vincent Breitmoser | 2014-07-26 | 1 | -12/+9 |
* | | | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 2 | -15/+18 |
* | | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 3 | -0/+7 |
|/ / |