aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-2418-200/+331
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
| * Fix new decrypt buttonDominik Schürmann2014-09-241-3/+0
| |
| * cleanupDominik Schürmann2014-09-241-28/+0
| |
| * Button text for decryptDominik Schürmann2014-09-242-13/+79
| |
| * 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-237-68/+155
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-231-0/+3
| |\
| * | DecryptTextActivity reworkDominik Schürmann2014-09-2310-62/+112
| | |
* | | fix signing in OK with yubikeysVincent Breitmoser2014-09-243-15/+37
| | |
* | | fix signatures produced by yubikeyVincent Breitmoser2014-09-241-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | The timestamp was only set on a second run. This led to a race condition whether the signature could be completed within the same timestamp. Fixes #834
* | | fix nullpointer in previous swipetorefresh fixVincent Breitmoser2014-09-231-5/+9
| |/ |/|
* | missed a secondary preference initializationVincent Breitmoser2014-09-231-0/+3
|/
* fix nullpointer ImportKeysListEntry (from pulltorefresh)Vincent Breitmoser2014-09-231-2/+5
| | | | Fixes #873
* disable pull to refresh in upper right cornerVincent Breitmoser2014-09-232-1/+26
| | | | | | | | While at the top of the list, the scroll bar handle is in the top right corner. Previously, dragging the handle from this position was difficult because touch events were intercepted by the pull to refresh handler. Closes #858
* be more precise on importresult overall errorVincent Breitmoser2014-09-232-4/+7
|
* take failed keys into account in importkeyresult notificationVincent Breitmoser2014-09-232-1/+16
|
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-2313-154/+208
|
* reject keys with duplicate subkeys altogetherVincent Breitmoser2014-09-233-1/+17
| | | | closes #870
* add test case for duplicate keys in keyring (#870)Vincent Breitmoser2014-09-232-4/+4
|
* log "unspecified" flags differentlyVincent Breitmoser2014-09-223-2/+14
|
* nicer code in key import for flag log typesVincent Breitmoser2014-09-221-75/+27
|
* show authenticate flag in logsVincent Breitmoser2014-09-223-54/+128
|
* Hack to fix #805Dominik Schürmann2014-09-224-18/+71
|
* Fix possible nullpointer in ImportKeysFileFragmentDominik Schürmann2014-09-211-1/+1
|
* Fix custom key configuration for primary user idsDominik Schürmann2014-09-216-11/+38
|
* Fix LogDisplayFragmentDominik Schürmann2014-09-213-13/+14
|
* Fix ConsolidateResult, needed parcelable methodsDominik Schürmann2014-09-212-2/+21
|
* Merge pull request #871 from timbray/masterDominik Schürmann2014-09-211-1/+4
|\ | | | | Handle absence of personal information in Keybase search result
| * 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-219-51/+206
|/
* Add null check to getSecretKeyTypeDominik Schürmann2014-09-211-1/+1
|
* Small UI fixesDominik Schürmann2014-09-218-51/+44
|
* Merge user ids in import list for better displayDominik Schürmann2014-09-215-61/+98
|
* key spinner fixesDominik Schürmann2014-09-213-33/+50
|
* settings code cleanupDominik Schürmann2014-09-211-18/+14
|
* New key flags icons, subkey adapter redesign, support authanticate flag in ↵Dominik Schürmann2014-09-2034-36/+109
| | | | database
* no monospace for key idsDominik Schürmann2014-09-204-21/+13
|
* fix isLocal logic (f*ck yeah unit tests!)Vincent Breitmoser2014-09-201-1/+1
|
* respect user id revocation signaturesVincent Breitmoser2014-09-204-34/+84
| | | | Closes #836
* forgot a LogLevel pieceVincent Breitmoser2014-09-191-78/+77
|
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-1912-23/+76
|
* Remove certificate validation code from ViewCertActivity, they are already ↵Dominik Schürmann2014-09-193-49/+3
| | | | validated by import
* Use key icons in import, prettify itemsDominik Schürmann2014-09-186-40/+60
|
* Fixes for nfc decryptDominik Schürmann2014-09-183-9/+18
|
* Fix nfc signingDominik Schürmann2014-09-182-2/+2
|
* Stop refreshing after all keys have been updatedDominik Schürmann2014-09-181-4/+4
|
* Swipe-to-refresh fixesDominik Schürmann2014-09-181-1/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 20:47:17 +0000