aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Collapse)AuthorAgeFilesLines
* Change convertFingerprintToHex to use RuntimeExceptionDominik Schürmann2015-05-281-7/+4
|
* Improve stringsDominik Schürmann2015-05-282-6/+3
|
* do nfc dispatching in MainActivityVincent Breitmoser2015-05-284-9/+15
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-05-211-13/+20
|\
| * add user id flags to UserAttribute self signaturesVincent Breitmoser2015-05-201-13/+20
| |
* | Fix language based on feedback from transifexDominik Schürmann2015-05-212-2/+2
|/
* Fix fingerprint length check in QR Code importDominik Schürmann2015-05-191-1/+1
|
* Use Mode.ALPHANUMERIC for QR codes to save spaceDominik Schürmann2015-05-194-9/+24
|
* check fingerprint length after scanning qr codeVincent Breitmoser2015-05-172-13/+26
| | | | Fixes #1281
* open ViewKeyActivity by subkey in NfcBaseActivityVincent Breitmoser2015-05-171-3/+4
|
* simplify MainActivity and fix backstack issuesVincent Breitmoser2015-05-171-60/+33
|
* re-parcel log in LogDisplayFragmentVincent Breitmoser2015-05-171-6/+20
|
* fingerprints are 20 bytes, not 40. duh.Vincent Breitmoser2015-05-171-1/+1
|
* load yubikey fragment after mMasterKeyId is availableVincent Breitmoser2015-05-171-17/+33
|
* apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-176-9/+66
|
* pass masterKeyId to yubikey fragmentVincent Breitmoser2015-05-172-6/+9
|
* allow state loss when yubikey fragment is loadedVincent Breitmoser2015-05-171-1/+2
|
* yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-172-41/+53
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-171-28/+12
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* 3.2.1Dominik Schürmann2015-05-101-1/+1
|
* Fixing rotate crashes in create keyDominik Schürmann2015-05-102-9/+5
|
* Fix crash with v3 key fingerprintsDominik Schürmann2015-05-101-1/+10
|
* CleanupDominik Schürmann2015-05-101-21/+0
|
* Fixes and clarifications to app signature (or better certificate) pinningDominik Schürmann2015-05-104-38/+50
|
* Add self-encrypt for old APIDominik Schürmann2015-05-101-0/+14
|
* fixed sync on key import, 'me' linked contact crashAdithya Abraham Philip2015-05-083-1/+52
|
* check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
|
* Fix import of keyring with pub+sec key with same key idDominik Schürmann2015-05-062-62/+80
|
* Rename for consistencyDominik Schürmann2015-05-062-5/+4
|
* Renaming for consisitencyDominik Schürmann2015-05-061-6/+5
|
* Move error overlay into generalized DecryptFragment, better error handling ↵Dominik Schürmann2015-05-064-41/+55
| | | | in DecryptTextActivity
* Switch to new library reposDominik Schürmann2015-05-066-7/+6
|
* revert unneeded changes for short key IDWilliam Faulk2015-05-041-27/+3
|
* revert unneeded changes for old temp Bluetooth share fileWilliam Faulk2015-05-041-13/+0
|
* use single file extensionWilliam Faulk2015-05-041-1/+1
|
* use TemporaryStorageProvider for Bluetooth ShareWilliam Faulk2015-05-042-32/+18
|
* Use FILE_EXTENSION constantsWilliam Faulk2015-05-041-1/+1
|
* Use primary user ID for filename instead of short key IDWilliam Faulk2015-05-041-2/+5
|
* Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greaterWilliam Faulk2015-05-041-42/+44
|
* Fix Bluetooth share without breaking othersWilliam Faulk2015-05-043-9/+99
|
* Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-043-34/+24
|
* Fix cancel/skip in create key wizardDominik Schürmann2015-05-043-52/+35
|
* Display notify above keyboard in CreateKeyEmailFragmentDominik Schürmann2015-05-041-2/+2
|
* Fix email patternDominik Schürmann2015-05-041-1/+1
|
* Use more simple email validation regexDominik Schürmann2015-05-041-7/+8
|
* Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵Dominik Schürmann2015-05-042-51/+93
|\ | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-301-10/+10
| | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing
| * -Removed unneeded view references from the fragment class since they are not ↵Daniel Ramos2015-04-261-7/+3
| | | | | | | | | | | | used outside of createView. -cleanup
| * -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵Daniel Ramos2015-04-261-3/+0
| | | | | | | | and Lollipop (5.1) phone and everything seems to be preserved as expected.
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-2617-224/+533
| |\ | | | | | | | | | into development