aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2014-10-092-2/+2
|\ \ \
| * | | fix plurals quantity string in ImportKeyResultVincent Breitmoser2014-10-041-1/+1
| * | | yubikey: check with correct subkey id for sign operationVincent Breitmoser2014-10-041-1/+1
* | | | reduce memory footprint in QrCodeActivity as wellVincent Breitmoser2014-10-091-3/+16
* | | | reduce memory footprint of qr code in share tabVincent Breitmoser2014-10-092-18/+17
| |_|/ |/| |
* | | rename certify_key_item to the more appropriate multi_certify_itemVincent Breitmoser2014-10-081-1/+1
| |/ |/|
* | Remove unnecessary exceptionDominik Schürmann2014-10-082-9/+4
* | Big error screen if signature is invalid or key is revoked/expired, also fixe...Dominik Schürmann2014-10-084-36/+90
* | Handle revoked and expired keys in decrypt activityDominik Schürmann2014-10-081-17/+39
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-084-25/+15
|\ \
| * | remove ui hack, use padding instead of marginVincent Breitmoser2014-10-081-10/+0
| * | use "Key ID" for beautifyVincent Breitmoser2014-10-081-1/+1
| * | automatically extend single compound entry logsVincent Breitmoser2014-10-082-14/+14
* | | New decryption screen UI with modernPGP iconsDominik Schürmann2014-10-083-104/+205
|/ /
* | Filter key list by certified keysDominik Schürmann2014-10-081-0/+51
* | Move utf8 check for user id upwardsDominik Schürmann2014-10-071-4/+5
* | Fix MSG_MF_UID_PRIMARY logDominik Schürmann2014-10-071-1/+1
* | Cleanup and fix decrypt activityDominik Schürmann2014-10-071-20/+32
* | Certify designDominik Schürmann2014-10-071-12/+0
* | get rid of some old code in LogDisplayFragmentVincent Breitmoser2014-10-061-70/+4
* | certify: checkbox fake click area tidbitVincent Breitmoser2014-10-061-0/+10
* | Fix app nameDominik Schürmann2014-10-051-0/+2
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-056-45/+49
|\ \
| * | UI stuffDominik Schürmann2014-10-056-45/+49
* | | use sub results in importVincent Breitmoser2014-10-052-3/+14
* | | add support for second line in log viewVincent Breitmoser2014-10-053-6/+52
* | | add support for hierarchical log entriesVincent Breitmoser2014-10-052-7/+85
|/ /
* | use status icons in public key selectionDominik Schürmann2014-10-053-24/+34
* | Add cloud iconDominik Schürmann2014-10-051-0/+1
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-054-56/+63
|\ \
| * | Give result down to listDominik Schürmann2014-10-052-50/+58
| * | Make bit size optionalDominik Schürmann2014-10-053-6/+5
* | | even more layout neatificationVincent Breitmoser2014-10-051-0/+1
|/ /
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-055-10/+39
|\ \
| * | preselect certify keyDominik Schürmann2014-10-055-13/+34
| * | Display result in multi certifyDominik Schürmann2014-10-043-1/+9
* | | more layout neatificationVincent Breitmoser2014-10-051-1/+1
* | | slight layout changes to keyspinner_itemVincent Breitmoser2014-10-051-1/+1
|/ /
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-041-2/+2
|\ \
| * | use new multi certify, layout fixesDominik Schürmann2014-10-041-2/+2
* | | merge key ids in getSelectedCertifyActionsVincent Breitmoser2014-10-042-24/+28
|/ /
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-0411-189/+320
|\ \
| * | add dividerDominik Schürmann2014-10-041-3/+1
| * | qr code download, cleanupDominik Schürmann2014-10-042-117/+63
| * | Workings on new parcel for key downloadsDominik Schürmann2014-10-047-76/+199
| * | Pass imported master key ids via result parcelDominik Schürmann2014-10-043-44/+48
| * | Fixing import, start qr code stuffDominik Schürmann2014-10-041-50/+116
* | | implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-045-8/+622
* | | certify: get rid of fingerprint checkVincent Breitmoser2014-10-044-15/+6
|/ /
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-048-33/+593
|\ \