aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* linked: basic shared element transitionVincent Breitmoser2015-09-061-0/+2
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-65/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-121-4/+4
|
* linked-ids: small compatibility changesVincent Breitmoser2015-05-111-1/+1
|
* linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-4/+4
|
* linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-3/+3
|
* linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-091-4/+4
|
* small ui nicetiesVincent Breitmoser2015-04-271-5/+6
|
* don't show key spinner for a single entryVincent Breitmoser2015-04-241-1/+3
|
* use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-41/+15
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-19/+19
| | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-2/+2
| | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* even more linked id ui workVincent Breitmoser2015-03-291-22/+17
|
* more (subtle) ui workVincent Breitmoser2015-03-261-8/+21
|
* more linked id ui fine tuningVincent Breitmoser2015-03-261-0/+2
|
* some linked id ui fine tuningVincent Breitmoser2015-03-261-23/+30
|
* secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-5/+5
|
* work on cookie scanning during creationVincent Breitmoser2015-03-241-1/+1
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-2/+3
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* work on certification uiVincent Breitmoser2015-03-151-11/+19
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-2/+2
| | | | | | 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-13/+28
|
* improve error handling in LinkedIdViewFragment, disable unknown identity ↵Vincent Breitmoser2015-03-131-7/+24
| | | | types (for now?)
* remove notiion of nonce/identifierVincent Breitmoser2015-03-131-3/+1
|
* better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-27/+50
|
* minor additions to CertListWidgetVincent Breitmoser2015-03-101-2/+1
|
* cleaner handling of verification stateVincent Breitmoser2015-03-101-46/+64
|
* concurrency and continuity fixes for verification backstack handlingVincent Breitmoser2015-03-101-14/+26
|
* support backstack for verificationVincent Breitmoser2015-03-091-12/+26
|
* rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-091-56/+46
|
* fix transition animationVincent Breitmoser2015-03-091-1/+16
|
* use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-88/+174
|
* successfully certify linked idsVincent Breitmoser2015-03-081-11/+62
|
* work on certification stepVincent Breitmoser2015-03-081-6/+90
|
* prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-061-3/+10
|
* first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-061-8/+108
|
* work on LinkedIdViewFragmentVincent Breitmoser2015-03-051-5/+116
|
* do a TON of UI workVincent Breitmoser2015-03-051-0/+45