Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 1 | -0/+2 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 6 | -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 uri | Vincent Breitmoser | 2015-05-16 | 1 | -1/+1 |
| | |||||
* | rename LinkedIdentity to LinkedAttribute | Vincent Breitmoser | 2015-05-12 | 2 | -6/+6 |
| | |||||
* | linked-ids: small compatibility changes | Vincent Breitmoser | 2015-05-11 | 1 | -1/+1 |
| | |||||
* | linked-ids: add certificate pinning, pin twitter api cert | Vincent Breitmoser | 2015-05-09 | 3 | -3/+4 |
| | |||||
* | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 1 | -4/+4 |
| | |||||
* | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 5 | -13/+13 |
| | |||||
* | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 11 | -96/+92 |
| | |||||
* | small ui niceties | Vincent Breitmoser | 2015-04-27 | 2 | -6/+8 |
| | |||||
* | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 4 | -10/+46 |
| | |||||
* | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 1 | -1/+1 |
| | |||||
* | don't show key spinner for a single entry | Vincent Breitmoser | 2015-04-24 | 1 | -1/+3 |
| | |||||
* | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 2 | -73/+25 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 2 | -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-identities | Vincent Breitmoser | 2015-04-09 | 2 | -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 work | Vincent Breitmoser | 2015-03-29 | 1 | -22/+17 |
| | |||||
* | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 1 | -8/+21 |
| | |||||
* | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -0/+2 |
| | |||||
* | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -23/+30 |
| | |||||
* | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 1 | -5/+5 |
| | |||||
* | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 6 | -13/+25 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 6 | -16/+16 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 3 | -0/+252 |
| | |||||
* | work on certification ui | Vincent Breitmoser | 2015-03-15 | 1 | -11/+19 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 2 | -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 differently | Vincent Breitmoser | 2015-03-14 | 1 | -13/+28 |
| | |||||
* | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 3 | -23/+25 |
| | |||||
* | don't filter tweet intent | Vincent Breitmoser | 2015-03-13 | 1 | -31/+6 |
| | |||||
* | improve error handling in LinkedIdViewFragment, disable unknown identity ↵ | Vincent Breitmoser | 2015-03-13 | 1 | -7/+24 |
| | | | | types (for now?) | ||||
* | verification takes a second at least | Vincent Breitmoser | 2015-03-13 | 1 | -1/+11 |
| | |||||
* | use ViewAnimator for progress, streamline text on first step | Vincent Breitmoser | 2015-03-13 | 1 | -7/+4 |
| | |||||
* | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 7 | -30/+10 |
| | |||||
* | twitter layout step3 -> step2 | Vincent Breitmoser | 2015-03-12 | 1 | -1/+1 |
| | |||||
* | small fix for CreateFinalFragment | Vincent Breitmoser | 2015-03-12 | 2 | -5/+2 |
| | |||||
* | twitter Step3 -> Step2 | Vincent Breitmoser | 2015-03-12 | 2 | -12/+5 |
| | |||||
* | ditch custom text step for twitter | Vincent Breitmoser | 2015-03-12 | 3 | -174/+18 |
| | |||||
* | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 4 | -45/+43 |
| | |||||
* | better state management in LinkedIdView, move confirm progress into card | Vincent Breitmoser | 2015-03-10 | 1 | -27/+50 |
| | |||||
* | minor additions to CertListWidget | Vincent Breitmoser | 2015-03-10 | 1 | -2/+1 |
| | |||||
* | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 1 | -46/+64 |
| | |||||
* | concurrency and continuity fixes for verification backstack handling | Vincent Breitmoser | 2015-03-10 | 1 | -14/+26 |
| | |||||
* | support backstack for verification | Vincent Breitmoser | 2015-03-09 | 1 | -12/+26 |
| | |||||
* | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 1 | -56/+46 |
| | |||||
* | fix transition animation | Vincent Breitmoser | 2015-03-09 | 1 | -1/+16 |
| | |||||
* | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -88/+174 |
| | |||||
* | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -11/+62 |
| | |||||
* | work on certification step | Vincent Breitmoser | 2015-03-08 | 1 | -6/+90 |
| | |||||
* | finish after linked id creation | Vincent Breitmoser | 2015-03-06 | 1 | -12/+1 |
| | |||||
* | use final fragment superclass for twitter | Vincent Breitmoser | 2015-03-06 | 1 | -98/+23 |
| |