aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
| | | |
| * | | fix crash when moving focus from EncryptKeyCompletionView with unknown textVincent Breitmoser2015-04-281-1/+1
| | | |
| * | | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an unknown key, there is no indication of the state the key is in. To indicate both immediate action required, and to make this status equal to its worst case (rather than *better* than its worst case), the status is displayed in red. At some point, we will probably want to download unknown keys automatically, at which point an unknown key will actually be an error state. This is an intermediate solution until then.
| * | | fix "select all" in key list multi-selectVincent Breitmoser2015-04-281-1/+1
| | | |
| * | | small ui nicetiesVincent Breitmoser2015-04-274-7/+24
| | | |
| * | | prevent crashes in EncryptKeyCompletionViewVincent Breitmoser2015-04-271-2/+10
| | | |
| * | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-14/+29
| | | |
| * | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+13
| | | |
| * | | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-272-19/+43
| | | |
| * | | show linked ids card only if unfiltered ids are availableVincent Breitmoser2015-04-261-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2627-183/+802
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| * | | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-257-17/+53
| | | | |
| * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-6/+13
| | | | |
| * | | | fix encrypt activity layoutVincent Breitmoser2015-04-241-2/+1
| | | | |
| * | | | revamp decrypt uiVincent Breitmoser2015-04-243-149/+347
| | | | |
| * | | | don't show key spinner for a single entryVincent Breitmoser2015-04-242-1/+10
| | | | |
| * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-244-76/+30
| | | | |
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2497-3441/+4758
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | |