aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-244-76/+30
| | | | | |
| | * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2499-3465/+4785
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0933-182/+864
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-393/+400
| | | | | | | |
| | * | | | | | even more linked id ui workVincent Breitmoser2015-03-295-28/+29
| | | | | | | |
| | * | | | | | more (subtle) ui workVincent Breitmoser2015-03-262-9/+38
| | | | | | | |
| | * | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-261-0/+2
| | | | | | | |
| | * | | | | | some linked id ui fine tuningVincent Breitmoser2015-03-265-27/+34
| | | | | | | |
| | * | | | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-246-25/+18
| | | | | | | |
| | * | | | | | work on cookie scanning during creationVincent Breitmoser2015-03-2411-153/+150
| | | | | | | |
| | * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2484-1005/+1533
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | | | | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
| | | | | | | | |
| | * | | | | | | support github resource (re)Vincent Breitmoser2015-03-244-0/+263
| | | | | | | | |
| | * | | | | | | support github resource (pa)Vincent Breitmoser2015-03-244-46/+221
| | | | | | | | |
| | * | | | | | | work on certification uiVincent Breitmoser2015-03-156-12/+46
| | | | | | | | |
| | * | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-1555-468/+1371
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-144-28/+46
| | | | | | | | | |
| | * | | | | | | | 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-132-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1317-103/+38
| | | | | | | | | |
| | * | | | | | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-121-1/+1
| | | | | | | | | |
| | * | | | | | | | regenerate twitter tokenVincent Breitmoser2015-03-121-4/+16
| | | | | | | | | |
| | * | | | | | | | 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-128-108/+214
| | | | | | | | | |
| | * | | | | | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-27/+50
| | | | | | | | | |
| | * | | | | | | | hack loadSystemContact back inVincent Breitmoser2015-03-102-5/+13
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-107-13/+548
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| | * | | | | | | | | add expand item to linked id listVincent Breitmoser2015-03-102-4/+43
| | | | | | | | | | |
| | * | | | | | | | | filter out unknown linked idsVincent Breitmoser2015-03-103-22/+116
| | | | | | | | | | |
| | * | | | | | | | | minor additions to CertListWidgetVincent Breitmoser2015-03-102-9/+18
| | | | | | | | | | |
| | * | | | | | | | | cleaner handling of verification stateVincent Breitmoser2015-03-101-46/+64
| | | | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1024-432/+786
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 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-093-69/+192
| | | | | | | | | | | |
| | * | | | | | | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-092-7/+15
| | | | | | | | | | | |
| | * | | | | | | | | | fix transition animationVincent Breitmoser2015-03-093-9/+41
| | | | | | | | | | | |
| | * | | | | | | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-098-110/+267
| | | | | | | | | | | |
| | * | | | | | | | | | successfully certify linked idsVincent Breitmoser2015-03-084-21/+80
| | | | | | | | | | | |
| | * | | | | | | | | | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-084-7/+5
| | | | | | | | | | | |
| | * | | | | | | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-083-11/+11
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0832-540/+1154
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | | | | | | | | 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
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 09:47:32 +0000