aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofsTim Bray2014-11-211-2/+1
|\
| * fix signature checkDominik Schürmann2014-11-221-2/+2
* | Add check that proof & database fingerprints are the sameTim Bray2014-11-212-4/+8
|/
* Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-224-9/+13
* Use master key id for keybase proof verificationDominik Schürmann2014-11-221-10/+4
* Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-214-25/+20
|\
| * more cleanupDominik Schürmann2014-11-211-14/+9
| * Minor code cleanupDominik Schürmann2014-11-214-11/+11
* | Prevent multiple cloud-trust-search launches. Handle DNS query failure grace...Tim Bray2014-11-192-1/+8
* | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-182-3/+20
* | All keybase proofs now in placeTim Bray2014-11-113-44/+89
* | Fix a no-result corner case, and make verifications clickableTim Bray2014-11-071-1/+2
* | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-075-21/+732
|/
* export secret and public keys in separate armored blocksVincent Breitmoser2014-10-311-9/+24
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-302-13/+11
|\
| * Changelog 3.1.1Dominik Schürmann2014-10-301-1/+1
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-304-102/+28
| |\
| * | Always use INTEGER instead of BOOLEAN in database to avoid confusionDominik Schürmann2014-10-291-12/+10
* | | forgot a thing for secret key exportVincent Breitmoser2014-10-301-18/+24
| |/ |/|
* | Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
* | remove unused ExchangeKeySpinner classVincent Breitmoser2014-10-291-100/+0
* | Close stream on key export to avoid partial write (see #986)Vincent Breitmoser2014-10-291-0/+7
* | retrofit getBlob method of matrixcursor for android 2.3Vincent Breitmoser2014-10-271-1/+20
|/
* Fix crash with NotFoundExceptionDominik Schürmann2014-10-261-3/+8
* Rename multi certify files to certifyDominik Schürmann2014-10-266-22/+17
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-267-5/+30
|\
| * Display error on certification attempt with yubikeyVincent Breitmoser2014-10-262-0/+6
| * disable cancel button instead of hiding it on cancel preventionVincent Breitmoser2014-10-261-1/+1
| * fix consolidate if no secret key are presentVincent Breitmoser2014-10-261-2/+6
| * prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-264-2/+17
* | Fix notify after certifyDominik Schürmann2014-10-262-26/+20
|/
* Use new safe slinger activity from share tabDominik Schürmann2014-10-261-76/+26
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-266-16/+56
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-261-10/+10
| |\
| * | implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-266-16/+56
* | | Move advanced info into own activityDominik Schürmann2014-10-265-263/+214
| |/ |/|
* | Keyboard testsDominik Schürmann2014-10-261-10/+10
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-264-7/+23
|\
| * Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-264-3/+19
| * Fix layout of select key adapterDominik Schürmann2014-10-261-4/+4
* | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-262-4/+17
|/
* Remove empty layoutDominik Schürmann2014-10-251-24/+0
* Remove PassphraseDialogFragmentDominik Schürmann2014-10-252-435/+2
* Remove old certify activityDominik Schürmann2014-10-253-461/+1
* Use passphrase dialog activity instead of passphrase dialogDominik Schürmann2014-10-253-36/+67
* Remove old exception handling code from loadersDominik Schürmann2014-10-251-35/+3
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-253-8/+20
|\
| * remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-253-8/+20
* | Fix color in import listDominik Schürmann2014-10-251-6/+8
|/
* Remove tabs from import keys activityDominik Schürmann2014-10-253-320/+62