aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2026-500/+498
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-202-154/+36
| | | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
| * Remove on click on iconDominik Schürmann2015-03-191-0/+2
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-192-45/+81
| |\ | | | | | | | | | development
| | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | | | | | | | | | | | Displays the snackbar above the keyboard on all activities.
| | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-191-40/+51
| | | | | | | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity.
| * | Manage my keys wizardDominik Schürmann2015-03-1911-263/+323
| |/
| * New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1917-65/+81
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-205-89/+37
| |
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-195-43/+54
| |
* | yubikey certifications!Vincent Breitmoser2015-03-183-62/+117
| |
* | generalize nfc crypto input structureVincent Breitmoser2015-03-184-24/+519
| |
* | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-181-1/+3
|/
* File extensions into ConstantsDominik Schürmann2015-03-174-13/+15
|
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-163-8/+36
|
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-164-6/+27
|
* object oriented split user idDominik Schürmann2015-03-1620-88/+84
|
* Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
|
* Clarify MIME usageDominik Schürmann2015-03-152-2/+2
|
* Remove display of key id in other listsDominik Schürmann2015-03-153-18/+65
|
* Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
|
* Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
|
* Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
|\ | | | | Preselected Suitable Key
| * Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
| |
* | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-151-1/+3
|\ \ | | | | | | -fixed out of bounds crash when retrieving the main profile name with se...
| * | -fixed out of bounds crash when retrieving the main profile name with secret ↵Daniel Ramos2015-03-151-1/+3
| | | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid
* | | Dont display key ids in KeySpinner, display creation date when user ids ↵Dominik Schürmann2015-03-153-14/+37
| | | | | | | | | | | | duplicate
* | | Query for duplicate user idsDominik Schürmann2015-03-151-1/+4
|/ /
* | added some documentationAdithya Abraham Philip2015-03-131-4/+5
| |
* | added own profile support in linekd system contactAdithya Abraham Philip2015-03-131-7/+25
| |
* | Clarify logs in DeleteFileDialogDominik Schürmann2015-03-121-2/+2
| |
* | Use notify instead of Toast for NFC checkDominik Schürmann2015-03-121-2/+2
| |
* | Merge pull request #1133 from Rrego6/developmentDominik Schürmann2015-03-121-0/+6
|\ \ | | | | | | Check if NFC is available on device
| * | Check if NFC is available on deviceRaoul2015-03-101-0/+6
| | |
* | | Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-1215-24/+27
|\ \ \ | | | | | | | | #1042: Replaced ints with enums
| * | | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-094-29/+32
| |\| |
| * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-0915-24/+27
| | | | | | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* | | | Improve file deletion stringsDominik Schürmann2015-03-121-3/+3
| | | |
* | | | Merge pull request #1137 from manojkhannakm/developmentDominik Schürmann2015-03-123-46/+104
|\ \ \ \ | | | | | | | | | | Updated fix for Issue #1116
| * | | | Updated fix for Issue #1116Manoj Khanna2015-03-113-46/+104
| | |_|/ | |/| |
* / | | corrected linked system contact display nameAdithya Abraham Philip2015-03-111-11/+12
|/ / /
* | | Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-101-3/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * | | Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+19
| | | |
| * | | Make create key wizard step-by-stepDominik Schürmann2015-03-105-35/+312
| | | |
| * | | cleaned up code, added commentsAdithya Abraham Philip2015-03-101-9/+15
| | | | | | | | | | | | | | | | optimised imports
| * | | added contact linkingAdithya Abraham Philip2015-03-101-9/+52
| | | |
| * | | added cardAdithya Abraham Philip2015-03-101-0/+18
| | |/ | |/|
* | | Add additional email addresses in create keyDominik Schürmann2015-03-105-6/+433
| | |
* | | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+19
| | |
* | | Make create key wizard step-by-stepDominik Schürmann2015-03-095-35/+312
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 06:03:08 +0000