aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Exception handling with keyserver queriesDominik Schürmann2014-07-312-6/+14
|
* couple of logging fixesVincent Breitmoser2014-07-313-6/+4
|
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-3125-236/+213
|
* Better exception handling for import of keysDominik Schürmann2014-07-319-47/+27
|
* More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-313-17/+181
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-303-23/+15
|\
| * couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-303-23/+15
| |
* | Create key: work on uploadDominik Schürmann2014-07-308-192/+242
|/
* Create key: repeat passphraseDominik Schürmann2014-07-305-11/+46
|
* Create key: uploadDominik Schürmann2014-07-302-13/+22
|
* Fix drawer in key listDominik Schürmann2014-07-301-4/+4
|
* return values for create keyDominik Schürmann2014-07-303-8/+22
|
* Create key: layout above buttonsDominik Schürmann2014-07-302-4/+8
|
* Fix conflictsDominik Schürmann2014-07-302-3/+25
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3046-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 AppMsgsVincent Breitmoser2014-07-292-10/+7
| |
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-2940-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 Breitmoser2014-07-2714-52/+100
| | |
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-2715-120/+87
| | |
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-26174-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 2Vincent Breitmoser2014-07-072-3/+64
| | | |
| | * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-0717-112/+82
| | | |
| | * | get rid of AppMsg libraryVincent Breitmoser2014-07-077-753/+1
| | | |
| * | | watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-283-10/+19
| | | | | | | | | | | | | | | | fixes #721
* | | | Create key with fragmentsDominik Schürmann2014-07-3014-297/+733
|/ / /
* | | Fix build by removing old icon referenceDominik Schürmann2014-07-281-1/+0
| | |
* | | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-2835-53/+77
| | |
* | | Use verified icon for certify actionDominik Schürmann2014-07-282-13/+52
| | |
* | | Set visibility at lastDominik Schürmann2014-07-282-6/+6
| | |
* | | Use icons in key viewDominik Schürmann2014-07-285-43/+64
| | |
* | | Use new status icons in key listDominik Schürmann2014-07-282-44/+29
| | |
* | | Smaller status images, green testDominik Schürmann2014-07-2862-5/+5
| | |
* | | Fix resource names, add small testDominik Schürmann2014-07-2877-7/+12
| | |
* | | Add icons from ModernPGP projectDominik Schürmann2014-07-28172-0/+491
| | |
* | | Fix background color of notify areaDominik Schürmann2014-07-271-2/+0
| | |
* | | cleanup left-oversDominik Schürmann2014-07-271-2/+0
| | |
* | | Redesigned QR Code viewDominik Schürmann2014-07-278-134/+170
| | |
* | | Load QR Code asynchronously and with a fade in animationDominik Schürmann2014-07-271-5/+41
| | |
* | | Open keyboard on passphrase dialog, this should now work on all Android ↵Dominik Schürmann2014-07-274-44/+109
| | | | | | | | | | | | versions... hopefully
* | | Make PassphraseCacheService a foreground serviceDominik Schürmann2014-07-271-72/+67
| | |
* | | Update gradle plugin to 0.12.2Dominik Schürmann2014-07-273-1/+1
| | |
* | | Update spongycastleDominik Schürmann2014-07-271-0/+0
| | |
* | | Merge pull request #720 from artbristol/skip-bc-tests-externallyDominik Schürmann2014-07-271-0/+9
|\ \ \ | | | | | | | | Skip spongycastle tests in root project
| * | | Skip spongycastle tests in root projectArt O Cathain2014-07-271-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 buttonsDominik Schürmann2014-07-272-41/+76
| | |
* | | Work on first time wizard designDominik Schürmann2014-07-2711-107/+215
|/ /
* | canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
| |
* | test: add tons of tests and fuzzing for UncachedKeyRing.canonicalizeVincent Breitmoser2014-07-261-37/+453
| |
* | generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
| |
* | test: add misc UncachedKeyRing testsVincent Breitmoser2014-07-264-8/+132
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 23:45:31 +0000