aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* Add TlsHelper (designed to be used with sks-keyservers.net)mar-v-in2014-06-231-0/+83
| | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
* Switch to dnsjavamar-v-in2014-06-232-15/+18
|
* ditch outdated certifyKey operationVincent Breitmoser2014-06-221-54/+0
|
* use arraylists instead of arrays in savekeyringparcelVincent Breitmoser2014-06-221-14/+14
|
* fix indentation in various key import methodsVincent Breitmoser2014-06-221-60/+64
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-2213-283/+478
|\
| * Merge pull request #672 from artbristol/functional-testingDominik Schürmann2014-06-216-51/+126
| |\ | | | | | | VERY basic test for save keyring
| | * VERY basic test for save keyringArt O Cathain2014-06-216-51/+126
| | |
| * | Cleanup pull keybase codeDominik Schürmann2014-06-211-6/+1
| | |
| * | Merge pull request #668 from timbray/masterDominik Schürmann2014-06-212-222/+29
| |\ \ | | | | | | | | Moved Keybase stuff into KeybaseLib submodule
| | * | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-202-222/+29
| | | |
| * | | Start new designed activityDominik Schürmann2014-06-215-8/+326
| | |/ | |/|
* | | fix parcel method in ParcelableKeyRingVincent Breitmoser2014-06-221-1/+3
| | |
* | | use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-223-2/+12
|/ /
* | Fix qr code finallyDominik Schürmann2014-06-204-19/+31
| |
* | import: forward motion events to activity regardlessVincent Breitmoser2014-06-201-0/+12
| |
* | Work on Qr code importDominik Schürmann2014-06-205-43/+70
|/
* Fix keybase importDominik Schürmann2014-06-203-2/+5
|
* Use actionbar button for log activityDominik Schürmann2014-06-202-4/+48
|
* Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-6/+7
|
* Fix update from keyserver flowDominik Schürmann2014-06-202-5/+7
|
* Merge pull request #658 from artbristol/functional-testingVincent2014-06-202-0/+92
|\ | | | | Start on Robolectric integration test
| * Fix hard-coded sizeArt O Cathain2014-06-161-3/+6
| |
| * Start on Robolectric integration testArt O Cathain2014-06-162-0/+89
| |
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵mar-v-in2014-06-1914-379/+193
|\ \ | | | | | | | | | improve-file
| * | Fix app name in PGP header, closing #663Dominik Schürmann2014-06-191-1/+1
| | |
| * | Fixing fingerprint search, part 1Dominik Schürmann2014-06-191-80/+88
| | |
| * | Remove unused code to import splitted qr codesDominik Schürmann2014-06-191-77/+1
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-193-124/+3
| |\ \
| | * | remove obsolete subkey binding check from signature verificationVincent Breitmoser2014-06-193-124/+3
| | | |
| * | | New callback model for ImportKeysActivityDominik Schürmann2014-06-197-108/+95
| |/ /
| * | forward touch events to pager in import activityVincent Breitmoser2014-06-181-0/+13
| | |
| * | fix key exportVincent Breitmoser2014-06-181-1/+1
| | |
| * | canonicalize: missed two logging entriesVincent Breitmoser2014-06-182-1/+4
| | |
* | | Merge branch 'master' into improve-filemar-v-in2014-06-1836-1803/+2673
|\| |
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-183-57/+201
| |\ \
| | * \ Merge pull request #661 from mar-v-in/improve-contactsDominik Schürmann2014-06-182-53/+198
| | |\ \ | | | | | | | | | | Improve contact sync
| | | * | Reset importDone at the beginning of syncmar-v-in2014-06-181-0/+1
| | | | |
| | | * | Wait for import to be done before writing contactsmar-v-in2014-06-181-2/+19
| | | | |
| | | * | Remove abandoned contactsmar-v-in2014-06-181-26/+90
| | | | |
| | | * | Code stylemar-v-in2014-06-181-13/+26
| | | | |
| | | * | Continue contact db syncmar-v-in2014-06-181-39/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only add keyrings to contact db that are not expired nor revoked - Merge all user ids of a key into one contact (#659) - Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db TODO: - delete contact once keyring is removed from OK - sync: wait for key downloads to complete before changing contact db
| * | | | Merge branch 'new-edit'Vincent Breitmoser2014-06-188-990/+296
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml
| | * | | | new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-173-72/+139
| | | | | |
| | * | | | new-edit: add new save keyring stuffVincent Breitmoser2014-06-173-151/+124
| | | | | |
| | * | | | new-edit: remove old save keyring stuffVincent Breitmoser2014-06-176-819/+83
| | | | | |
| * | | | | generate public keyring from secret if not availableVincent Breitmoser2014-06-183-20/+37
| | |/ / / | |/| | |
| * | | | consolidate: almost sane loggingVincent Breitmoser2014-06-183-46/+59
| | | | |
| * | | | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-186-50/+195
| | | | |
| * | | | consolidate: make it workVincent Breitmoser2014-06-183-99/+118
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 22:19:43 +0000