aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Use selected number of users in safe slingerDominik Schürmann2014-10-251-0/+1
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-251-0/+2
|\ | | | | | | development
| * set padding for sublog entriesVincent Breitmoser2014-10-251-0/+2
| |
* | Safe slinger activity prepsDominik Schürmann2014-10-253-141/+231
|/
* Merge pull request #973 from timbray/developmentDominik Schürmann2014-10-241-5/+6
|\ | | | | Make the Certify screen a little more self-explanatory
| * Make the Certify screen a little more self-explanatoryTim Bray2014-10-211-5/+6
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-233-15/+22
|\ \ | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-238-31/+54
| |\| | | | | | | | | | development
| * | integrate download from keyserver into key import operationVincent Breitmoser2014-10-233-13/+20
| | |
* | | Start safe slinger activityDominik Schürmann2014-10-231-0/+43
| | |
* | | Externalize QR Code scanning and import into its own activity for better ↵Dominik Schürmann2014-10-234-116/+230
| |/ |/| | | | | code separation
* | consistency for import UIDominik Schürmann2014-10-161-5/+27
| |
* | Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-161-3/+3
| |
* | More consisitencyDominik Schürmann2014-10-152-6/+6
| |
* | More color/icon consistencyDominik Schürmann2014-10-155-20/+21
|/
* color experimentsDominik Schürmann2014-10-154-76/+82
|
* actually remove filter spinner code. that's what git is for~Vincent Breitmoser2014-10-131-46/+0
|
* Remove key list filter for nowDominik Schürmann2014-10-131-27/+27
|
* Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-133-2/+41
|
* remove outdated AddKeysActivityVincent Breitmoser2014-10-131-463/+0
|
* DeleteResult: add custom createNotifyVincent Breitmoser2014-10-112-11/+21
|
* move around package structure a bitVincent Breitmoser2014-10-1022-53/+40
|
* add keys button goes to directly to qr scanVincent Breitmoser2014-10-102-8/+118
|
* keylist: add safeslinger exchange button to secret keysVincent Breitmoser2014-10-102-13/+182
|
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-098-13/+21
|\
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-098-13/+21
| |
| * Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-098-11/+13
| | | | | | | | 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-098-13/+11
| | |
* | | 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
|/
* Big error screen if signature is invalid or key is revoked/expired, also ↵Dominik Schürmann2014-10-082-33/+71
| | | | 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-082-11/+1
|\ | | | | | | development
| * remove ui hack, use padding instead of marginVincent Breitmoser2014-10-081-10/+0
| |
| * use "Key ID" for beautifyVincent Breitmoser2014-10-081-1/+1
| |
* | 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
|
* 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
| |
* | add support for second line in log viewVincent Breitmoser2014-10-051-6/+43
| |
* | add support for hierarchical log entriesVincent Breitmoser2014-10-051-4/+31
|/
* use status icons in public key selectionDominik Schürmann2014-10-053-24/+34
|
* Add cloud iconDominik Schürmann2014-10-051-0/+1
|