aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'hkps-support' into automatic-contact-discoverymar-v-in2014-05-291-15/+54
|\ \ \ \ \
| * | | | | Fix url building to support certificate check on hkps serversmar-v-in2014-05-281-8/+19
| * | | | | Add hkps supportmar-v-in2014-05-271-9/+37
* | | | | | Store nice origin with keybase keys (that can't be interpreted as HKP server)mar-v-in2014-05-291-1/+2
* | | | | | Make abstract methods in Keyserver public (implementations make them public a...mar-v-in2014-05-291-3/+3
* | | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYSmar-v-in2014-05-291-3/+4
|/ / / / /
* | | | | Store origin with ImportKeysListEntrymar-v-in2014-05-273-0/+13
* | | | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV recordmar-v-in2014-05-271-0/+38
* | | | | ContactHelper can read email addresses from contact listmar-v-in2014-05-261-0/+21
| |_|_|/ |/| | |
* | | | Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-236-32/+33
* | | | Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
* | | | Add Log.d for QueryFailedExceptionTim Bray2014-05-236-37/+25
| |_|/ |/| |
* | | Merge highlight keyserver pull requestDominik Schürmann2014-05-189-91/+128
|\ \ \
| * | | Rename mCurQuery to mQuery for consistencyThialfihar2014-05-161-5/+5
| * | | Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-163-79/+28
| * | | Add highlighting to keyserver/keybase searchThialfihar2014-05-165-5/+75
| * | | Support mutliple search words and highlight themThialfihar2014-05-163-6/+24
* | | | Rename KeyServer to KeyserverDominik Schürmann2014-05-189-38/+34
|/ / /
* | | keybase cleanups for revised search output formatTim Bray2014-05-151-24/+7
* | | keybase now has key info in search outputTim Bray2014-05-151-0/+5
* | | JWalk javadocsTim Bray2014-05-141-0/+48
* | | Rename fingerPrint to fingerprintThialfihar2014-05-145-16/+16
* | | Add github, twitter, website info for keybase keysThialfihar2014-05-141-0/+17
* | | Cleanup keybase query a bitThialfihar2014-05-141-15/+14
* | | Don't guess keybase key algorithm and sizeThialfihar2014-05-142-5/+8
* | | Add extraData property in ImportKeyListEntryThialfihar2014-05-143-8/+20
* | | List full keybase id or strong key id matches on topThialfihar2014-05-141-1/+10
* | | Make keybase lookup works for key ids starting with 0xThialfihar2014-05-141-1/+6
| |/ |/|
* | Removed unused Toast importDaniel Haß2014-05-111-1/+0
* | Toast replacementDaniel Haß2014-05-111-2/+4
* | Fixed wrong AppMsg-StyleDaniel Haß2014-05-111-2/+2
* | ui: purplize dialog headers (huge hack inside)Vincent Breitmoser2014-05-0812-28/+63
* | proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-086-148/+189
* | use longsparsearrays instead of hashmaps in that one placeVincent Breitmoser2014-05-081-16/+19
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-083-5/+1
|\ \
| * | use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-083-5/+1
* | | Use flat buttons where appropriateDominik Schürmann2014-05-083-14/+10
|/ /
* | use LoaderFragment in ViewKey tabsVincent Breitmoser2014-05-084-44/+32
* | extract generic LoaderFragment superclass from KeyListVincent Breitmoser2014-05-082-61/+88
* | Don't allow certification using keys where primary subkey is strippedVincent Breitmoser2014-05-071-4/+7
* | Add applications section to helpDominik Schürmann2014-05-074-5/+5
* | Remove code for sharing whole key via qr codeDominik Schürmann2014-05-072-129/+16
* | Start app menu item for registered appsDominik Schürmann2014-05-071-4/+24
* | GET_KEY: also return PendingIntent to key viewDominik Schürmann2014-05-072-2/+11
* | Better handling of actionbars backDominik Schürmann2014-05-076-46/+50
* | Design fixes for certification activityDominik Schürmann2014-05-071-44/+43
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-075-52/+102
|\ \
| * | ui: use SlidingTabLayout in help activityVincent Breitmoser2014-05-071-20/+30
| * | small fix for 6aafb3, forgot to commit this lineVincent Breitmoser2014-05-071-0/+1
| * | ui: purplize searchtext in keylistVincent Breitmoser2014-05-071-0/+3