aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-131-0/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-121-0/+4
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fix Bluetooth share without breaking othersWilliam Faulk2015-05-041-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵Dominik Schürmann2015-05-041-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-263-23/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into development
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| | * | | | | | | | | | | | | | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-141-0/+1
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment.
* | | | | | | | | | | | | | | Fix yubikey stringsDominik Schürmann2015-05-011-5/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix key creation string and displayDominik Schürmann2015-04-301-2/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-301-0/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | UI fixes for Android < 5Dominik Schürmann2015-04-261-6/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Switch to new support lib version 22.1Dominik Schürmann2015-04-251-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Remove old navigation drawer dependencyDominik Schürmann2015-04-252-9/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | revamp decrypt uiVincent Breitmoser2015-04-241-7/+8
|/ / / / / / / / / / / /
* | | | | | | | | | | | Fixed Snackbar behind layoutManoj Khanna2015-04-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Surrounded string with quotes
* | | | | | | | | | | | keyserver verification on additionAdithya Abraham Philip2015-04-221-0/+12
| | | | | | | | | | | |
* | | | | | | | | | | | support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-201-0/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
| | | | | | | | | | |
* | | | | | | | | | | From passphrase to passwordDominik Schürmann2015-03-311-47/+47
| | | | | | | | | | |
* | | | | | | | | | | Simplify passphrase dialog designDominik Schürmann2015-03-311-1/+1
| | | | | | | | | | |
* | | | | | | | | | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-1/+0
| | | | | | | | | | |
* | | | | | | | | | | Fix strings with email addressDominik Schürmann2015-03-291-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | -Fixed a situation where additional emails could be duplicated when creating ↵Daniel Ramos2015-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
* | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-25/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * | | | | | | | | | 3.2beta3Dominik Schürmann2015-03-231-1/+1
| | | | | | | | | | |
| * | | | | | | | | | translation fixesDominik Schürmann2015-03-231-20/+0
| | | | | | | | | | |
| * | | | | | | | | | Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-231-4/+9
| | | | | | | | | | |
| * | | | | | | | | | introduced multi-threadingAdithya Abraham Philip2015-03-231-0/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
* | | | | | | | | | further improve yubikey error handlingVincent Breitmoser2015-03-231-0/+1
| | | | | | | | | |
* | | | | | | | | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-0/+1
| | | | | | | | | |
* | | | | | | | | | enable nfc in import dialog as wellVincent Breitmoser2015-03-221-1/+2
| | | | | | | | | |
* | | | | | | | | | finish ui flow for yubikey importVincent Breitmoser2015-03-221-6/+8
| | | | | | | | | |
* | | | | | | | | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-1/+3
| | | | | | | | | |
* | | | | | | | | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-0/+4
| | | | | | | | | |
* | | | | | | | | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-221-0/+2
| | | | | | | | | |
* | | | | | | | | | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
| | | | | | | | | |
* | | | | | | | | | fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+4
| | | | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
| * | | | | | | | | Manage my keys wizardDominik Schürmann2015-03-191-3/+5
| | | | | | | | | |
* | | | | | | | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-1/+2
| | | | | | | | | |
* | | | | | | | | | yubikey certifications!Vincent Breitmoser2015-03-181-1/+1
|/ / / / / / / / /
* | | | | | | | | Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-161-0/+1
| | | | | | | | |
* | | | | | | | | Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-161-1/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Improve file deletion stringsDominik Schürmann2015-03-121-3/+4
| | | | | | | |
* | | | | | | | Updated fix for Issue #1116Manoj Khanna2015-03-111-3/+4
| | | | | | | |
* | | | | | | | Pull from transifexDominik Schürmann2015-03-101-1/+1
| | | | | | | |
* | | | | | | | API 7Dominik Schürmann2015-03-101-1/+2
| |_|_|_|_|_|/ |/| | | | | |