aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-193-5/+2
|
* Remove certificate validation code from ViewCertActivity, they are already ↵Dominik Schürmann2014-09-192-23/+3
| | | | validated by import
* Use key icons in import, prettify itemsDominik Schürmann2014-09-181-30/+24
|
* Swipe-to-refresh fixesDominik Schürmann2014-09-181-3/+10
|
* Use key icons in spinnersDominik Schürmann2014-09-172-44/+40
|
* Result parcel refactorings (WIP)Dominik Schürmann2014-09-171-1/+1
|
* Work on new result handling (WIP)Dominik Schürmann2014-09-172-1/+2
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-1561-264/+982
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml
| * Pull from transifexDominik Schürmann2014-09-1542-161/+732
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-1510-84/+97
| |\
| | * Keys found on multiple servers are now imported from all of themTim Bray2014-09-132-11/+9
| | |
| | * Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵Tim Bray2014-09-131-2/+2
| | | | | | | | | | | | side is revoked/expired, the merge reflects that
| | * Restore Yubikey setting, lost in fumble-fingered mergeTim Bray2014-09-131-0/+7
| | |
| | * Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefsTim Bray2014-09-1310-89/+94
| | |
| * | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵Dominik Schürmann2014-09-159-13/+150
| | | | | | | | | | | | non-decodable characters)
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-141-1/+25
| |\ \
| * | | First work on decryptDominik Schürmann2014-09-143-2/+2
| | | |
* | | | move LogLevel info into LogType enumVincent Breitmoser2014-09-159-30/+30
| |_|/ |/| |
* | | work on OperationResultParcelVincent Breitmoser2014-09-141-2/+5
| |/ |/|
* | add SignEncryptResult parcel (probably break stuff)Vincent Breitmoser2014-09-141-1/+25
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-131-1/+1
|\
| * add key id to trailing asym data log msgVincent Breitmoser2014-09-131-1/+1
| |
* | Custom actionbar to indicate swipe down effectDominik Schürmann2014-09-132-0/+15
|/
* log warning on bad uid encodingVincent Breitmoser2014-09-131-0/+1
|
* Merge branch 'result-parcels'Vincent Breitmoser2014-09-131-0/+38
|\
| * some DecryptVerify log refinementsVincent Breitmoser2014-09-131-2/+2
| |
| * add a ton of logging to DecryptVerifyVincent Breitmoser2014-09-131-0/+38
| |
* | More smaller UI fixesDominik Schürmann2014-09-131-0/+1
| |
* | Implemented Pull2Refresh in the KeyListFragmentDaniel Albert2014-09-121-75/+71
|/ | | | | | Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs Added Pull2Refresh to the KeyListFragment
* add ui support for stripping subkeysVincent Breitmoser2014-09-111-0/+3
|
* Changelog 2.9.2Dominik Schürmann2014-09-091-0/+6
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-081-0/+5
|\
| * introduce SingletonResult for... singleton resultsVincent Breitmoser2014-09-081-3/+3
| |
| * Properly handle uneditable key types in EditKeyFragmentVincent Breitmoser2014-09-081-0/+5
| | | | | | | | | | | | | | More specifically, return an OperationResultParcel for stripped and divert-to-card keys, with an appropriate error message in the log. part of #828
* | Fix changelog versioningDominik Schürmann2014-09-081-1/+1
|/
* Pull from transifexDominik Schürmann2014-09-0851-775/+1115
|
* Changelog 2.10Dominik Schürmann2014-09-081-0/+14
|
* Fix problems in strings.xmlDominik Schürmann2014-09-071-31/+36
|
* flag revoked, epired and unavailable keys in selection spinnerVincent Breitmoser2014-09-071-10/+34
|
* Remove table layout, use hint text for edit fieldsDominik Schürmann2014-09-072-83/+65
|
* Put quotes around all strings, should fix transifex consistency problems, ↵Dominik Schürmann2014-09-071-646/+646
| | | | also see http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to Escaping apostrophes and quotes)
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-072-18/+52
|\
| * add proper async check for correct passphrase to passphrasedialogVincent Breitmoser2014-09-072-18/+52
| |
* | Two buttons to encrypt files and text, some fixesDominik Schürmann2014-09-072-13/+42
|/
* Better symmetric encryption layoutDominik Schürmann2014-09-071-38/+23
|
* More UI reworkDominik Schürmann2014-09-076-108/+154
|
* Fix width for encrypt toDominik Schürmann2014-09-071-1/+1
|
* Remove file menu items from text activityDominik Schürmann2014-09-062-4/+19
|
* Add experimental support for yubikey PINs, remove caching of empty passphrasesDominik Schürmann2014-09-051-0/+1
|
* Add yubikey default PIN preferenceDominik Schürmann2014-09-052-0/+9
|