Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | 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 | 41 | -1023/+332 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | |||||
| * | | | | | | fix a couple remaining AppMsgs | Vincent Breitmoser | 2014-07-29 | 2 | -10/+7 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 35 | -995/+309 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | |||||
| | * | | | | | | 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 | 53 | -1279/+1695 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | |||||
| | * | | | | | | | 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 | 2 | -744/+1 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | watch out for nullpointers from get(Un|)HashedSubpackets | Vincent Breitmoser | 2014-07-28 | 3 | -10/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #721 | |||||
* | | | | | | | | 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 ↵ | Dominik Schürmann | 2014-07-27 | 4 | -44/+109 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | versions... hopefully | |||||
* | | | | | | | 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 | |
|/ / / / / / | ||||||
* | | | | | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 5 | -5/+11 | |
| | | | | | | ||||||
* | | | | | | Fixed another unescaped apostrophe. | Daniel Albert | 2014-07-17 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Fixed unescaped apostrophe | Daniel Albert | 2014-07-17 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Added description to Setting, Changed title to suggested one | Daniel Albert | 2014-07-17 | 2 | -3/+5 | |
| | | | | | | ||||||
* | | | | | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 45 | -1120/+865 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |||||
| * | | | | | | Temporary program flow fixes | Dominik Schürmann | 2014-07-16 | 1 | -0/+3 | |
| | | | | | | | ||||||
| * | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 3 | -51/+57 | |
| | | | | | | | ||||||
| * | | | | | | New first time screen | Dominik Schürmann | 2014-07-16 | 15 | -681/+362 | |
| | | | | | | | ||||||
| * | | | | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 11 | -13/+34 | |
| | | | | | | | ||||||
| * | | | | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 9 | -22/+21 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ |