aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
Commit message (Collapse)AuthorAgeFilesLines
* linked: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-061-2/+1
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-13/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-261-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | even more linked id ui workVincent Breitmoser2015-03-291-1/+6
| | | |
| * | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-4/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-14/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | successfully certify linked idsVincent Breitmoser2015-03-081-0/+1
| | | | | |
| * | | | | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-081-4/+0
| | | | | |
* | | | | | don't cache exporthelper, keep type for KeyItem in KeySpinnerVincent Breitmoser2015-07-061-1/+1
| | | | | |
* | | | | | Fix account key selection for APIDominik Schürmann2015-07-061-1/+6
| | | | | |
* | | | | | use KeyAdapter in KeySpinnerVincent Breitmoser2015-06-171-121/+49
| | | | | |
* | | | | | preserve state in KeySpinner, and some lint fixesVincent Breitmoser2015-05-271-12/+34
| | | | | |
* | | | | | rewrite EncryptActivity data flowVincent Breitmoser2015-05-271-10/+15
| |_|_|_|/ |/| | | |
* | | | | Fix key creation string and displayDominik Schürmann2015-04-301-8/+8
| |_|_|/ |/| | |
* | | | Switch to new support lib version 22.1Dominik Schürmann2015-04-251-3/+3
| |_|/ |/| |
* | | object oriented split user idDominik Schürmann2015-03-161-4/+3
| |/ |/|
* | Fixes for selection of certify keyDominik Schürmann2015-03-151-2/+4
| |
* | Dont display key ids in KeySpinner, display creation date when user ids ↵Dominik Schürmann2015-03-151-12/+31
|/ | | | duplicate
* Hopefully fixes drop down icon for spinners on Android lower 5Dominik Schürmann2015-02-261-2/+6
|
* 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
* Import code, fix collision of key spinner with other loadersDominik Schürmann2014-10-041-3/+10
|
* key spinner fixesDominik Schürmann2014-09-211-26/+43
|
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-191-1/+1
|
* Use key icons in spinnersDominik Schürmann2014-09-171-12/+20
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-171-2/+2
| | | | created ui.util for everything related to formatting
* flag revoked, epired and unavailable keys in selection spinnerVincent Breitmoser2014-09-071-3/+25
|
* More UI reworkDominik Schürmann2014-09-071-2/+2
|
* Cleanup keyspinner layout, key id typeface monospaceDominik Schürmann2014-08-311-10/+9
|
* if there is only one private key, use it fo certification by defaultVincent Breitmoser2014-08-311-23/+16
|
* Add license headersDominik Schürmann2014-08-191-0/+17
|
* Do not allow self certifyingmar-v-in2014-08-141-1/+5
|
* Fix KeySpinner on cursor changemar-v-in2014-08-141-1/+6
|
* add OnKeyChangedListener to KeySpinnermar-v-in2014-08-141-3/+38
|
* factor KeySpinner outmar-v-in2014-08-141-0/+171
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 15:37:55 +0000