aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked
Commit message (Collapse)AuthorAgeFilesLines
* linked: disable DNS resource (for now)Vincent Breitmoser2015-08-311-0/+2
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-296-147/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* linked-ids: remove debug uriVincent Breitmoser2015-05-161-1/+1
|
* rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-122-6/+6
|
* linked-ids: small compatibility changesVincent Breitmoser2015-05-111-1/+1
|
* linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-093-3/+4
|
* linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-4/+4
|
* linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-095-13/+13
|
* linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-0911-96/+92
|
* small ui nicetiesVincent Breitmoser2015-04-272-6/+8
|
* update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-254-10/+46
|
* change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-251-1/+1
|
* 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-242-73/+25
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-242-24/+25
| | | | | | | | | | | 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-092-6/+6
| | | | | | | 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-246-13/+25
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-246-16/+16
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* support github resource (re)Vincent Breitmoser2015-03-243-0/+252
|
* work on certification uiVincent Breitmoser2015-03-151-11/+19
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-152-3/+3
| | | | | | 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
|
* work on second step of identity creationVincent Breitmoser2015-03-133-23/+25
|
* don't filter tweet intentVincent Breitmoser2015-03-131-31/+6
|
* improve error handling in LinkedIdViewFragment, disable unknown identity ↵Vincent Breitmoser2015-03-131-7/+24
| | | | types (for now?)
* verification takes a second at leastVincent Breitmoser2015-03-131-1/+11
|
* use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-131-7/+4
|
* remove notiion of nonce/identifierVincent Breitmoser2015-03-137-30/+10
|
* twitter layout step3 -> step2Vincent Breitmoser2015-03-121-1/+1
|
* small fix for CreateFinalFragmentVincent Breitmoser2015-03-122-5/+2
|
* twitter Step3 -> Step2Vincent Breitmoser2015-03-122-12/+5
|
* ditch custom text step for twitterVincent Breitmoser2015-03-123-174/+18
|
* finish implementing twitter resourceVincent Breitmoser2015-03-124-45/+43
|
* 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
|
* finish after linked id creationVincent Breitmoser2015-03-061-12/+1
|
* use final fragment superclass for twitterVincent Breitmoser2015-03-061-98/+23
|