aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Collapse)AuthorAgeFilesLines
* Create key: uploadDominik Schürmann2014-07-301-13/+20
|
* return values for create keyDominik Schürmann2014-07-303-8/+22
|
* Fix conflictsDominik Schürmann2014-07-301-1/+2
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3028-948/+299
|\ | | | | | | | | | | 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-2922-920/+276
| |\ | | | | | | | | | | | | | | | | | | 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-277-45/+93
| | |
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-2710-53/+66
| | |
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2641-1050/+1505
| | |\ | | | | | | | | | | | | | | | | | | | | 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-0713-106/+75
| | | |
| | * | get rid of AppMsg libraryVincent Breitmoser2014-07-071-744/+0
| | | |
| * | | watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-283-10/+19
| | | | | | | | | | | | | | | | fixes #721
* | | | Create key with fragmentsDominik Schürmann2014-07-305-217/+472
|/ / /
* | | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-284-23/+49
| | |
* | | Use verified icon for certify actionDominik Schürmann2014-07-281-2/+12
| | |
* | | Set visibility at lastDominik Schürmann2014-07-282-6/+6
| | |
* | | Use icons in key viewDominik Schürmann2014-07-282-22/+39
| | |
* | | Use new status icons in key listDominik Schürmann2014-07-281-20/+23
| | |
* | | Smaller status images, green testDominik Schürmann2014-07-281-1/+1
| | |
* | | Fix resource names, add small testDominik Schürmann2014-07-281-5/+10
| | |
* | | cleanup left-oversDominik Schürmann2014-07-271-2/+0
| | |
* | | Redesigned QR Code viewDominik Schürmann2014-07-273-115/+119
| | |
* | | 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-272-27/+92
| | | | | | | | | | | | versions... hopefully
* | | Make PassphraseCacheService a foreground serviceDominik Schürmann2014-07-271-72/+67
| | |
* | | Prettify buttonsDominik Schürmann2014-07-271-7/+6
| | |
* | | Work on first time wizard designDominik Schürmann2014-07-275-22/+90
| |/ |/|
* | canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
| |
* | generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
| |
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-264-43/+48
|\ \
| * | Program flow fixesDominik Schürmann2014-07-254-43/+48
| | |
* | | UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
| | |
* | | fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-262-15/+18
| | |
* | | test and fix: adding an empty user id should failVincent Breitmoser2014-07-262-0/+6
|/ /
* | canonicalize: fix for testsVincent Breitmoser2014-07-194-5/+9
| |
* | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1636-906/+728
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
| * | Temporary program flow fixesDominik Schürmann2014-07-161-0/+3
| | |
| * | Simple create keyDominik Schürmann2014-07-161-1/+0
| | |
| * | Simple create keyDominik Schürmann2014-07-162-46/+57
| | |
| * | New first time screenDominik Schürmann2014-07-166-474/+241
| | |
| * | Fallback if no primary user id existsDominik Schürmann2014-07-1611-13/+34
| | |
| * | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-159-22/+21
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-151-1/+1
| |\ \
| | * | signatures: a revocation reason does NOT determine if a cert is a revocation ↵Vincent Breitmoser2014-07-151-1/+1
| | | | | | | | | | | | | | | | type
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-153-3/+8
| |\| |
| | * | merge: different msg if nothing was mergedVincent Breitmoser2014-07-153-3/+8
| | | |
| * | | some fixes for editDominik Schürmann2014-07-152-4/+5
| |/ /
| * | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-155-23/+373
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | modifyKey: error out on integrity check failsVincent Breitmoser2014-07-122-10/+18
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 17:18:11 +0000