aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* added some documentationAdithya Abraham Philip2015-03-132-27/+87
|
* added own profile support in linekd system contactAdithya Abraham Philip2015-03-132-10/+61
|
* links own keys to me profile in contactsAdithya Abraham Philip2015-03-131-9/+118
|
* 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-1218-73/+108
|\ \ | | | | | | #1042: Replaced ints with enums
| * | Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-112-2/+2
| | |
| * | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-094-29/+32
| |\|
| * | Added braces to if else.danielnelz2015-03-092-4/+6
| | |
| * | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-0918-73/+106
| | | | | | | | | | | | | | | 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
| | | |
* | | | Merge pull request #1134 from adithyaphilip/sync-confirmed-keysDominik Schürmann2015-03-123-14/+53
|\ \ \ \ | | | | | | | | | | Sync only confirmed keys and change
| * | | | added contact sync at end of CertifyOperationAdithya Abraham Philip2015-03-111-0/+4
| | | | |
| * | | | corrected linked system contact display nameAdithya Abraham Philip2015-03-112-14/+49
| |/ / /
* / / / change user_id primary key in database, use keyring rather than unified ↵Vincent Breitmoser2015-03-113-14/+26
|/ / / | | | | | | | | | query in consolidate
* | | make constant for certify hash algoDominik Schürmann2015-03-112-11/+6
| | |
* | | Disable maybe methods in ImportKeysListEntry for nowDominik Schürmann2015-03-101-2/+3
| | |
* | | Fix expiry, revoked checks in OpenPgpSignatureResultBuilderDominik Schürmann2015-03-101-2/+2
| | |
* | | API 7Dominik Schürmann2015-03-108-204/+555
| | |
* | | RippleDominik Schürmann2015-03-101-3/+1
| | |
* | | 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-102-9/+16
| | | | | | | | | | | | | | | | optimised imports
| * | | added contact linkingAdithya Abraham Philip2015-03-102-9/+80
| | | |
| * | | added cardAdithya Abraham Philip2015-03-101-0/+18
| | |/ | |/|
* | | Merge pull request #1121 from adithyaphilip/rawcontact-deletionDominik Schürmann2015-03-101-3/+47
|\ \ \ | | | | | | | | Fixed contact deletion Issue #1120
| * | | added CALLER_IS_SYNCADAPTER parameter to delete queriesAdithya Abraham Philip2015-03-101-3/+47
| | | |
* | | | 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
|/ /
* | Some fixes for delete after encryptionDominik Schürmann2015-03-091-22/+27
| |
* | Fix ascii armor in encrypt activityDominik Schürmann2015-03-091-3/+2
| |
* | Fix compression check in activitiesDominik Schürmann2015-03-093-4/+3
|/
* API: If signature key is known return pi to show keyDominik Schürmann2015-03-091-73/+72
|
* Fix colors for remote activityDominik Schürmann2015-03-091-1/+1
|
* Cleanup new widgetsDominik Schürmann2015-03-093-38/+41
|
* Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-094-54/+53
|\ | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
| * Implemented NameEditTextchipset952015-03-094-96/+10
| |
| * Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106chipset952015-03-093-101/+85
| |
* | Redesign of encrypt activites finishedDominik Schürmann2015-03-097-57/+123
| |
* | Removed unused PasswordEditTextDominik Schürmann2015-03-091-101/+0
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-098-81/+228
|\| | | | | | | development
| * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-094-64/+131
| |\ | | | | | | Passphrase strength indicator
| | * minor code style correctionAdithya Abraham Philip2015-03-073-2/+10
| | |
| | * removed created by commentAdithya Abraham Philip2015-03-061-3/+0
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 23:57:30 +0000