aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* allow linked token without one colonVincent Breitmoser2015-05-121-3/+2
|
* rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-125-13/+13
|
* Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1181-712/+1142
|\ | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * 3.2.1Dominik Schürmann2015-05-102-3/+3
| |
| * 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
| |
| * Reformat manifestDominik Schürmann2015-05-101-23/+23
| |
| * 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
| |
| * Version 3.2Dominik Schürmann2015-05-0624-25/+25
| |
| * Pull from transifexDominik Schürmann2015-05-0610-141/+163
| |
| * 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-062-11/+10
| |
| * Move error overlay into generalized DecryptFragment, better error handling ↵Dominik Schürmann2015-05-065-117/+181
| | | | | | | | in DecryptTextActivity
| * Switch to new library reposDominik Schürmann2015-05-066-7/+6
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-05-053-9/+54
| |\ | | | | | | | | | development
| | * 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-044-9/+100
| | |
| * | Cleanup manifestDominik Schürmann2015-05-051-15/+16
| | |
| * | Fix nullpointer in file decryptionDominik Schürmann2015-05-051-1/+1
| |/
| * Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-044-37/+27
| |
| * 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-043-51/+94
| |\ | | | | | | | | | | | | | | | | | | 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-303-12/+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-2641-450/+770
| | |\ | | | | | | | | | | | | into development
| | * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-245-44/+92
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| | | * | -Fixed a crash while recreating CreateKeyEmailFragmentDaniel Ramos2015-04-241-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | -Email data is properly restored while rotating the Activity. -Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email.
| | | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-146-30/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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 dublicated code in CreateKeyEmailFragmentDominik Schürmann2015-05-041-4/+0
| | | | |
| * | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵Dominik Schürmann2015-05-041-2/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into manojkhannakm-development
| | * | | | Espresso test for CreateKeyActivityManoj Khanna2015-04-251-5/+6
| | | | | |
| * | | | | license header for PgpCertifyOperationDominik Schürmann2015-05-041-1/+19
| | | | | |
| * | | | | Apply patch from ↵Dominik Schürmann2015-05-041-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938
| * | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 ↵Dominik Schürmann2015-05-041-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | with db upgrade
| * | | | | Fix yubikey stringsDominik Schürmann2015-05-012-7/+7
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 21:51:25 +0000