aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-1/+2
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-13/+9
| | |
* | | Give key flag colors their own color namesThialfihar2015-07-211-2/+2
| |/ |/| | | | | | | This removes "bg_gray" and selector_transparent_button.xml, which is unused and the last file to reference "bg_gray".
* | Remove time from key creation displayDominik Schürmann2015-04-301-1/+0
| |
* | Fix key creation string and displayDominik Schürmann2015-04-301-1/+1
| |
* | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-13/+9
|/
* object oriented split user idDominik Schürmann2015-03-161-5/+5
|
* Remove display of key id in other listsDominik Schürmann2015-03-151-6/+26
|
* #1042 replaced some int constants with enumsDaniel Nelz2015-03-041-2/+3
| | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
* First work on new key view toolbarDominik Schürmann2015-02-251-2/+2
|
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-1/+1
| | | | | | | - 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
* Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-261-2/+2
|
* Fix layout of select key adapterDominik Schürmann2014-10-261-4/+4
|
* More color/icon consistencyDominik Schürmann2014-10-151-1/+1
|
* use status icons in public key selectionDominik Schürmann2014-10-051-16/+18
|
* More beautifyKeyIdWithPrefixDominik Schürmann2014-10-031-1/+1
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-171-3/+3
| | | | created ui.util for everything related to formatting
* Edit key: subkey adding, not finishedDominik Schürmann2014-08-041-1/+1
|
* neatness refactoringVincent Breitmoser2014-06-041-1/+2
|
* Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-161-3/+11
|
* More code cleanupDominik Schürmann2014-04-191-4/+3
|
* Prettify more layoutsDominik Schürmann2014-04-111-2/+3
|
* Select*KeyFragment rewritesVincent Breitmoser2014-04-101-64/+57
| | | | | | | | | | - moved all specific Public/Secret logic from the Adapter class into inner subclasses in the Fragments - more versatile status display ("revoked", "expired", "can certify"...) - applied view holder pattern - query logic, including subqueries, moved into provider classes Closes #375
* Cleanup in SelectKeyCursorAdapterDominik Schürmann2014-04-091-8/+2
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+165