aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-10-037-10/+42
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
| * more getActivity() checksVincent Breitmoser2014-10-031-2/+11
| |
| * fix nullpointer with subtle attention seekerVincent Breitmoser2014-10-031-8/+9
| |
| * fix hideKeyboard() in other activities as well, just to be safeVincent Breitmoser2014-10-024-0/+12
| |
| * fix NullPointerException in keyboard hackVincent Breitmoser2014-10-021-1/+10
| |
* | Fix nullpointer with clipboardDominik Schürmann2014-10-032-10/+9
|/
* Remove unnecessary call to mFingerprintQrCodeDominik Schürmann2014-10-021-2/+0
|
* Fix IllegalStateException in ViewKeyShareFragmentDominik Schürmann2014-10-021-11/+14
|
* code styleDominik Schürmann2014-10-021-5/+5
|
* Add null check when retrieving key ids from contacts apiDominik Schürmann2014-10-021-0/+7
|
* Add workaround for bug #912Dominik Schürmann2014-10-021-0/+7
|
* Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling ↵Dominik Schürmann2014-10-012-16/+27
| | | | in decryt screen
* More debugging outputDominik Schürmann2014-10-011-0/+4
|
* fix ByteBuffer offset mistake in NfcActivityVincent Breitmoser2014-09-301-1/+2
|
* pass (encryption) key id from Decrypt*Fragment to NfcActivityVincent Breitmoser2014-09-304-17/+33
|
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-301-2/+3
|
* add (optional) keyId check in NfcActivityVincent Breitmoser2014-09-301-5/+20
|
* revamp fingerprint and keyid methods in NfcActivityVincent Breitmoser2014-09-301-18/+47
|
* Fix nullpointer in DecryptActivityDominik Schürmann2014-09-291-4/+8
|
* Fixes for share to decryptDominik Schürmann2014-09-292-4/+5
|
* Maybe fixes encrypt files on tabletsDominik Schürmann2014-09-292-2/+2
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-293-5/+2
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/AndroidManifest.xml
| * Fix NfcActivity task stack problemDominik Schürmann2014-09-293-5/+2
| |
* | add barely functional nfc intent activity (WIP!)Vincent Breitmoser2014-09-291-0/+312
|/
* Hide keyboard after cloud searchDominik Schürmann2014-09-271-0/+13
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-271-1/+1
|\
| * nfc: use proper hex encoding for pin lengthVincent Breitmoser2014-09-261-1/+1
| | | | | | | | Fixes #886
* | Dont show keyboard by default in key creation to allow the user to get an ↵Dominik Schürmann2014-09-271-3/+1
|/ | | | overview what to type, use spannable where possible
* disable pull to refresh (for now)Vincent Breitmoser2014-09-241-2/+6
|
* fix save button when no file is selectedVincent Breitmoser2014-09-241-0/+4
|
* show message about saving multiple files rather than hide the buttonVincent Breitmoser2014-09-241-23/+8
|
* move more stuff into EncryptActivity superclassVincent Breitmoser2014-09-243-226/+147
|
* use correct pin for nfc in EncryptActivityVincent Breitmoser2014-09-242-1/+7
|
* allow 1024 bit key signaturesVincent Breitmoser2014-09-241-3/+2
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-241-26/+26
|\
| * Fix logging in NFcActivityDominik Schürmann2014-09-241-26/+26
| |
* | fix Le fields in APDUsVincent Breitmoser2014-09-241-5/+6
|/
* Fix yubikey pin lengths other than 6Vincent Breitmoser2014-09-241-1/+1
| | | | Closes #883
* add subtle attention seeker to decryptactivity with available clipboard dataVincent Breitmoser2014-09-242-0/+138
| | | | | | Thanks Cyril Mottier https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
* Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵Dominik Schürmann2014-09-243-5/+498
| | | | need to separate
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-243-20/+36
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-2410-169/+247
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
| * | fix signing in OK with yubikeysVincent Breitmoser2014-09-242-15/+26
| | |
| * | fix nullpointer in previous swipetorefresh fixVincent Breitmoser2014-09-231-5/+9
| | |
* | | DecryptFiles: Reset state for new file decrytionDominik Schürmann2014-09-241-1/+3
| |/ |/|
* | Fix yubikey file decryptionDominik Schürmann2014-09-243-20/+12
| |
* | Yubikey text decryption workingDominik Schürmann2014-09-242-2/+2
| |
* | Yubikey decryptionDominik Schürmann2014-09-244-80/+34
| |
* | DecryptFilesActivityDominik Schürmann2014-09-243-14/+21
| |
* | Implement buttons in DecryptTextFragmentDominik Schürmann2014-09-235-65/+150
| |