aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-0921-78/+140
|\
| * Better handling if no api key is selectedDominik Schürmann2014-10-091-1/+1
| |
| * Better handling if no api key is selectedDominik Schürmann2014-10-092-8/+14
| |
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-0920-70/+126
| |
| * Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-0920-119/+150
| | | | | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385.
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-091-1/+1
| |\ | | | | | | | | | development
| * | Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-0920-150/+119
| | |
* | | 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 ↵Dominik Schürmann2014-10-084-36/+90
| | | | | | | | fixes signature status for expired and revoked keys
* | 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 ↵Dominik Schürmann2014-10-084-25/+15
|\ \ | | | | | | | | | development
| * | 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 ↵Vincent Breitmoser2014-10-056-45/+49
|\ \ | | | | | | | | | into jacobshack-certify
| * | 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 ↵Vincent Breitmoser2014-10-054-56/+63
|\ \ | | | | | | | | | into jacobshack-certify
| * | 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 ↵Vincent Breitmoser2014-10-055-10/+39
|\ \ | | | | | | | | | | | | | | | | | | into jacobshack-certify Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
| * | 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 ↵Vincent Breitmoser2014-10-041-2/+2
|\ \ | | | | | | | | | into jacobshack-certify
| * | 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 ↵Vincent Breitmoser2014-10-0411-189/+320
|\ \ | | | | | | | | | into jacobshack-certify
| * | add dividerDominik Schürmann2014-10-041-3/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:41:55 +0000