aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-2/+3
|
* Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-141-0/+5
| | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* use new TokenAutoComplete 2.0.7, fixes #1636Vincent Breitmoser2016-03-231-8/+0
|
* Fix code styleDominik Schürmann2016-01-021-6/+6
|
* Temporary fix for #1636Dominik Schürmann2016-01-011-0/+7
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-20/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-1/+20
| | |
* | | show dummy item if there are no secret keysVincent Breitmoser2015-08-141-1/+23
| | |
* | | Fix crash with new themeDominik Schürmann2015-07-251-1/+1
| | |
* | | Make main text color themeableThialfihar2015-07-211-2/+2
| | |
* | | Give key flag colors their own color namesThialfihar2015-07-211-7/+7
| | | | | | | | | | | | | | | This removes "bg_gray" and selector_transparent_button.xml, which is unused and the last file to reference "bg_gray".
* | | Make header text and tertiary text color themeableThialfihar2015-07-211-1/+4
| | |
* | | grey out text color of key creation date for disabled itemsVincent Breitmoser2015-07-081-0/+1
| | |
* | | actually disable non-enabled items in keyspinner (in keyadapter) (fixes #1366)Vincent Breitmoser2015-07-061-12/+22
| | |
* | | use KeyAdapter for AllowedKeysListFragmentVincent Breitmoser2015-06-261-2/+7
| | |
* | | use KeyAdapter in KeySpinnerVincent Breitmoser2015-06-171-26/+43
| | |
* | | make KeyItem serializble, for state in TokenTextCompleteViewVincent Breitmoser2015-05-301-1/+3
| |/ |/|
* | Fix key creation string and displayDominik Schürmann2015-04-301-16/+1
| |
* | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-1/+20
|/
* Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
|
* rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-301-0/+279
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 12:07:24 +0000