aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Add + button besides TokenAutoComplete, Issue #925"Dominik Schürmann2016-05-121-18/+0
| | | | | | | This reverts commit 72d2a627ff7641a660628ed5d634209a93efebd2. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
* Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-291-0/+6
|\ | | | | Fix Crash when no encryption subkey is available, Issue #1817
| * Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-141-0/+6
| | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | Include only add button in dropdown widthDominik Schürmann2016-04-291-2/+2
| |
* | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain ↵Dominik Schürmann2016-04-291-0/+18
|\ \ | | | | | | | | | into 007durgesh219-Issue#925
| * | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-141-0/+18
| |/ | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* / Handle user input on key creation more generouslyfiaxh2016-04-151-18/+1
|/ | | | | Allow empty name and do not regex-check email fixes #1825
* Fix Unusable signing key not properly disabled, Issue #1468Durgesh2016-04-052-10/+0
| | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* Remove AspectRatioImageViewunyoungwax2016-02-231-138/+0
|
* inline-ttl: remove "default" settingVincent Breitmoser2016-01-061-9/+2
|
* inline-ttl: use ttl preference in ttl spinnerVincent Breitmoser2016-01-061-26/+21
|
* inline-ttl: create ttl choice customization setting activityVincent Breitmoser2016-01-061-5/+5
|
* passdialog: seconds field and some minor layout issuesVincent Breitmoser2016-01-061-1/+1
|
* passphraseactivity: add inline spinner to password dialogVincent Breitmoser2016-01-061-0/+79
|
* Add hint to encrypt fieldDominik Schürmann2015-12-221-4/+0
|
* Make ContactHelper less staticDominik Schürmann2015-12-212-2/+2
|
* encryptkeycompletionview: don't use prefixVincent Breitmoser2015-12-131-16/+4
|
* encryptkeycompletionview: don't initialize to null on attachVincent Breitmoser2015-11-301-9/+0
|
* prevent crashes in EncryptKeyCompletionView (2)Vincent Breitmoser2015-10-261-10/+19
|
* Update tokenautocompleteDominik Schürmann2015-10-261-15/+13
|
* enc-export: handle onSaveInstanceState, add nicer layout for landscapeVincent Breitmoser2015-09-291-0/+19
|
* enc-backup: use only one fragment after allVincent Breitmoser2015-09-251-0/+7
|
* statusindicator: method to set states by nameVincent Breitmoser2015-09-081-0/+9
|
* linked: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-061-2/+1
|
* statusindicator: don't redisplay child with animation if already shownVincent Breitmoser2015-09-011-0/+6
|
* linked: work on github designVincent Breitmoser2015-09-011-0/+5
|
* add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+25
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-294-5/+212
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.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/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-112-15/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | fix crash when moving focus from EncryptKeyCompletionView with unknown textVincent Breitmoser2015-04-281-1/+1
| | |
| * | prevent crashes in EncryptKeyCompletionViewVincent Breitmoser2015-04-271-2/+10
| | |
| * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-266-33/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| * | | 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
| | | | |
| * | | | 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
| * \ \ \ \ 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
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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
| * \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ 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
| * | | | | | | | | | intermediate state, nothing really working yetVincent Breitmoser2015-01-121-0/+38
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 05:29:20 +0000