aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* fix save button when no file is selectedVincent Breitmoser2014-09-241-0/+4
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-241-26/+141
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-241-5/+6
| |\
| * | propose apps in apps listDominik Schürmann2014-09-241-26/+141
* | | 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-244-3/+15
* | | allow 1024 bit key signaturesVincent Breitmoser2014-09-241-3/+2
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-242-27/+38
|\|
| * Fix logging in NFcActivityDominik Schürmann2014-09-242-27/+38
* | fix Le fields in APDUsVincent Breitmoser2014-09-241-5/+6
|/
* Fix yubikey pin lengths other than 6Vincent Breitmoser2014-09-241-1/+1
* add subtle attention seeker to decryptactivity with available clipboard dataVincent Breitmoser2014-09-242-0/+138
* Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ...Dominik Schürmann2014-09-244-7/+499
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-245-32/+62
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-2414-180/+264
| |\
| * | fix signing in OK with yubikeysVincent Breitmoser2014-09-243-15/+37
| * | fix signatures produced by yubikeyVincent Breitmoser2014-09-241-12/+15
| * | 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-244-25/+17
* | Yubikey text decryption workingDominik Schürmann2014-09-245-11/+12
* | Yubikey decryptionDominik Schürmann2014-09-248-92/+50
* | DecryptFilesActivityDominik Schürmann2014-09-243-14/+21
* | Implement buttons in DecryptTextFragmentDominik Schürmann2014-09-235-65/+150
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-231-0/+3
|\|
| * missed a secondary preference initializationVincent Breitmoser2014-09-231-0/+3
* | DecryptTextActivity reworkDominik Schürmann2014-09-238-58/+98
|/
* fix nullpointer ImportKeysListEntry (from pulltorefresh)Vincent Breitmoser2014-09-231-2/+5
* disable pull to refresh in upper right cornerVincent Breitmoser2014-09-232-1/+26
* be more precise on importresult overall errorVincent Breitmoser2014-09-231-1/+1
* take failed keys into account in importkeyresult notificationVincent Breitmoser2014-09-231-1/+12
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-2311-154/+203
* reject keys with duplicate subkeys altogetherVincent Breitmoser2014-09-232-1/+16
* add test case for duplicate keys in keyring (#870)Vincent Breitmoser2014-09-232-4/+4
* log "unspecified" flags differentlyVincent Breitmoser2014-09-222-2/+12
* nicer code in key import for flag log typesVincent Breitmoser2014-09-221-75/+27
* show authenticate flag in logsVincent Breitmoser2014-09-222-38/+96
* Hack to fix #805Dominik Schürmann2014-09-222-4/+57
* Fix possible nullpointer in ImportKeysFileFragmentDominik Schürmann2014-09-211-1/+1
* Fix custom key configuration for primary user idsDominik Schürmann2014-09-215-11/+36
* Fix LogDisplayFragmentDominik Schürmann2014-09-213-13/+14
* Fix ConsolidateResult, needed parcelable methodsDominik Schürmann2014-09-211-0/+19
* Merge pull request #871 from timbray/masterDominik Schürmann2014-09-211-1/+4
|\
| * Handle absence of personal information in Keybase search resultTim Bray2014-09-211-1/+4
* | Feature to change key configuration in create keyDominik Schürmann2014-09-217-49/+153
|/
* Add null check to getSecretKeyTypeDominik Schürmann2014-09-211-1/+1
* Small UI fixesDominik Schürmann2014-09-212-4/+3
* Merge user ids in import list for better displayDominik Schürmann2014-09-213-30/+87
* key spinner fixesDominik Schürmann2014-09-213-33/+50