aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* linked: correctly show errors in linked id wizardVincent Breitmoser2015-12-141-7/+1
|
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-011-7/+11
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-64/+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-2/+2
|
* linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-091-1/+1
|
* linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-4/+4
|
* linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-091-2/+2
|
* update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-251-3/+4
|
* use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-32/+10
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-5/+6
| | | | | | | | | | | 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-4/+4
| | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* work on cookie scanning during creationVincent Breitmoser2015-03-241-6/+14
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-1/+1
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-1/+1
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
* work on second step of identity creationVincent Breitmoser2015-03-131-1/+20
|
* 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-131-6/+2
|
* small fix for CreateFinalFragmentVincent Breitmoser2015-03-121-2/+2
|
* finish implementing twitter resourceVincent Breitmoser2015-03-121-6/+8
|
* finish after linked id creationVincent Breitmoser2015-03-061-12/+1
|
* use final fragment superclass for dnsVincent Breitmoser2015-03-061-1/+1
|
* extract linked id create final fragment superclassVincent Breitmoser2015-03-061-0/+249