Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 46 | -1033/+333 |
|\ | | | | | | | | | | | 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 | 40 | -1005/+310 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | 174 | -1260/+5344 |
| | |\ | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -753/+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 | 62 | -5/+5 |
| | | | |||||
* | | | Fix resource names, add small test | Dominik Schürmann | 2014-07-28 | 77 | -7/+12 |
| | | | |||||
* | | | Add icons from ModernPGP project | Dominik Schürmann | 2014-07-28 | 172 | -0/+491 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | Update gradle plugin to 0.12.2 | Dominik Schürmann | 2014-07-27 | 3 | -1/+1 |
| | | | |||||
* | | | Update spongycastle | Dominik Schürmann | 2014-07-27 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #720 from artbristol/skip-bc-tests-externally | Dominik Schürmann | 2014-07-27 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | Skip spongycastle tests in root project | ||||
| * | | | Skip spongycastle tests in root project | Art O Cathain | 2014-07-27 | 1 | -0/+9 |
| | |/ | |/| | | | | | | | | | | This will make moving back to a pure SC/BC upstream easier since we don't need to change their source code | ||||
* | | | Prettify buttons | Dominik Schürmann | 2014-07-27 | 2 | -41/+76 |
| | | | |||||
* | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 11 | -107/+215 |
|/ / | |||||
* | | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 2 | -18/+30 |
| | | |||||
* | | test: add tons of tests and fuzzing for UncachedKeyRing.canonicalize | Vincent Breitmoser | 2014-07-26 | 1 | -37/+453 |
| | | |||||
* | | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 |
| | | |||||
* | | test: add misc UncachedKeyRing tests | Vincent Breitmoser | 2014-07-26 | 4 | -8/+132 |
| | | |||||
* | | test: small code cleanup | Vincent Breitmoser | 2014-07-26 | 1 | -14/+4 |
| | | |||||
* | | test: don't need commutativity parameter here after all | Vincent Breitmoser | 2014-07-26 | 1 | -18/+6 |
| | | |||||
* | | test: (almost) full coverage for UncachedKeyRing.merge | Vincent Breitmoser | 2014-07-26 | 2 | -17/+64 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-26 | 5 | -43/+48 |
|\ \ |