aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | use final fragment superclass for dnsVincent Breitmoser2015-03-062-214/+19
| | | | | | | | | | |
| * | | | | | | | | | extract linked id create final fragment superclassVincent Breitmoser2015-03-062-221/+275
| | | | | | | | | | |
| * | | | | | | | | | prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-065-34/+42
| | | | | | | | | | |
| * | | | | | | | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-064-231/+310
| | | | | | | | | | |
| * | | | | | | | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-059-25/+170
| | | | | | | | | | |
| * | | | | | | | | | make linked identity list homogeneousVincent Breitmoser2015-03-0510-106/+150
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0538-451/+780
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | | | | | | | small fixes to the matcherVincent Breitmoser2015-03-051-5/+2
| | | | | | | | | | | |
| * | | | | | | | | | | fixed length identifiersVincent Breitmoser2015-03-052-7/+4
| | | | | | | | | | | |
| * | | | | | | | | | | do a TON of UI workVincent Breitmoser2015-03-0522-246/+456
| | | | | | | | | | | |
| * | | | | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-0419-226/+408
| | | | | | | | | | | |
| * | | | | | | | | | | remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
| | | | | | | | | | | |
| * | | | | | | | | | | nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-022-0/+19
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-027-279/+323
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * | | | | | | | | | | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-024-25/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-02160-5274/+7662
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.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/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * | | | | | | | | | | | | small language fixVincent Breitmoser2015-01-161-13/+17
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-163-9/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | dns resource is parametrized by fqdn, class and typeVincent Breitmoser2015-01-162-5/+34
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-1519-175/+147
| | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 10:35:03 +0000