aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
...
* Fix layout of select key adapterDominik Schürmann2014-10-261-4/+4
* 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-251-1/+10
|\
| * remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-251-1/+10
* | Fix color in import listDominik Schürmann2014-10-251-6/+8
|/
* Remove tabs from import keys activityDominik Schürmann2014-10-253-320/+62
* Fix result passingDominik Schürmann2014-10-252-2/+1
* Safeslinger fixesÄDominik Schürmann2014-10-251-4/+6
* Fix safe slinger buttonDominik Schürmann2014-10-251-1/+1
* Fix safe slinger buttonDominik Schürmann2014-10-251-2/+4
* 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 dev...Dominik Schürmann2014-10-251-0/+2
|\
| * 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-explanatoryTim Bray2014-10-211-5/+6
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-233-15/+22
|\ \
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-238-31/+54
| |\|
| * | 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 code...Dominik Schürmann2014-10-234-116/+230
| |/ |/|
* | 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
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-091-1/+1
| |\
| * | 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 fixe...Dominik Schürmann2014-10-082-33/+71
* 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-082-11/+1
|\
| * remove ui hack, use padding instead of marginVincent Breitmoser2014-10-081-10/+0