aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget
Commit message (Collapse)AuthorAgeFilesLines
* change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-251-5/+12
|
* fix encrypt activity layoutVincent Breitmoser2015-04-241-2/+1
|
* don't show key spinner for a single entryVincent Breitmoser2015-04-241-0/+7
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-1/+1
|\ | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-301-205/+73
| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
* | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-301-205/+73
| |
* | even more linked id ui workVincent Breitmoser2015-03-293-3/+12
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-244-18/+18
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * Manage my keys wizardDominik Schürmann2015-03-192-7/+8
| |
| * object oriented split user idDominik Schürmann2015-03-162-11/+10
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-154-32/+97
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Remove display of key id in other listsDominik Schürmann2015-03-151-12/+37
| |
| * 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
| | |
| * | Dont display key ids in KeySpinner, display creation date when user ids ↵Dominik Schürmann2015-03-153-14/+37
| |/ | | | | | | duplicate
* | show certificates for secret keys differentlyVincent Breitmoser2015-03-141-8/+12
| |
* | minor additions to CertListWidgetVincent Breitmoser2015-03-101-7/+17
| |
* | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-105-129/+155
|\|
| * Cleanup new widgetsDominik Schürmann2015-03-093-38/+41
| |
| * Implemented NameEditTextchipset952015-03-092-51/+4
| |
| * Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106chipset952015-03-093-101/+85
| |
| * minor code style correctionAdithya Abraham Philip2015-03-071-1/+2
| |
| * removed created by commentAdithya Abraham Philip2015-03-061-3/+0
| |
| * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-061-3/+5
| |
| * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-061-0/+2
| |
| * added PassphraseEditTextAdithya Abraham Philip2015-03-061-0/+84
| |
* | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-091-0/+131
| |
* | successfully certify linked idsVincent Breitmoser2015-03-081-0/+1
| |
* | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-081-4/+0
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-084-0/+675
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * Added GPLv3 Licensechipset952015-03-062-0/+34
| |
| * Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-062-0/+164
| |
| * Format code of merged password strength widgetDominik Schürmann2015-03-052-40/+49
| |
| * Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵Dominik Schürmann2015-03-052-0/+468
| |\ | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
| | * Add license to password strength view classesLukas Zorich2015-03-032-0/+48
| | |
| | * Implemented Matt Allen password strength indicatorLukas Zorich2015-03-032-0/+420
| | | | | | | | | | | | | | | | | | | | | I used most of Matt Allen password strength indicator code available here https://github.com/matt-allen/android-password-strength-indicator, but modified it a little bit in order to customize the view's colors through the xml.
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-053-7/+9
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-042-6/+8
| |\ \ | | | | | | | | #1042 replaced some int constants with enums
| | * | #1042 replaced some int constants with enumsDaniel Nelz2015-03-042-6/+8
| | |/ | | | | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
| * | Get high res version of contact photoDominik Schürmann2015-03-041-1/+1
| | |
| * | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵Dominik Schürmann2015-03-041-1/+1
| |/ | | | | | | instead of EXPIRY where possible
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-029-671/+182
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-271-99/+0
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-261-4/+5
| |\ | | | | | | | | | development
| | * pre-select certification key if only one is availableVincent Breitmoser2015-02-261-4/+5
| | |
| * | Hopefully fixes drop down icon for spinners on Android lower 5Dominik Schürmann2015-02-261-2/+6
| |/
| * First work on new key view toolbarDominik Schürmann2015-02-253-6/+146
| |
| * rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-012-4/+4
| | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService
| * Material Design: Full screen dialogsDominik Schürmann2015-01-261-18/+21
| |