aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * linked: move github client id and secret into build varsVincent Breitmoser2015-09-101-8/+5
| |
| * linked: localization for github creationVincent Breitmoser2015-09-101-19/+16
| |
| * linked: don't need javascript, so we don't enable itVincent Breitmoser2015-09-101-1/+0
| |
| * linked: fix screwups from last commit, sighVincent Breitmoser2015-09-101-9/+17
| |
| * linked: work on github lid creation error handlingVincent Breitmoser2015-09-101-38/+125
| |
| * linked: fix auth token revocation (maybe?)Vincent Breitmoser2015-09-081-1/+5
| |
| * linked: add "retry"Vincent Breitmoser2015-09-081-3/+17
| |
| * linked: move between fixed statesVincent Breitmoser2015-09-081-10/+56
| |
| * statusindicator: method to set states by nameVincent Breitmoser2015-09-081-0/+9
| |
| * linked: move client id and secret into static vars (build vars later)Vincent Breitmoser2015-09-081-3/+7
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-065-44/+42
| |\
| | * Use new HashSet<>(Arrays.asList()) instead of staticDominik Schürmann2015-09-041-38/+36
| | |
| | * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-034-6/+6
| | | | | | | | | | | | Move launcher icons to mipmap
| * | linked: clear cookies and don't save form data in oauth webviewVincent Breitmoser2015-09-061-1/+5
| | |
| * | linked: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-063-3/+38
| | |
| * | linked: basic shared element transitionVincent Breitmoser2015-09-067-270/+105
| | |
| * | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-022-99/+171
| |/
| * statusindicator: don't redisplay child with animation if already shownVincent Breitmoser2015-09-011-0/+6
| |
| * linked: smooth over progress with tactical pausesVincent Breitmoser2015-09-011-19/+23
| |
| * linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-012-11/+74
| |
| * fix missing date in CryptoInputParcel in some cases (could be a bigger problem!)Vincent Breitmoser2015-09-011-1/+3
| |
| * linked: work on github designVincent Breitmoser2015-09-012-12/+56
| |
| * linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-014-9/+316
| |
| * add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+25
| |
| * linked: disable DNS resource (for now)Vincent Breitmoser2015-08-312-4/+6
| |
| * Show linked identity menu item and linked identities only when feature is ↵Dominik Schürmann2015-08-292-5/+9
| | | | | | | | enabled
| * Reword experimental settingsDominik Schürmann2015-08-291-2/+4
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-292-70/+145
| |\
| | * Support OpenPGP API v9Dominik Schürmann2015-08-281-10/+6
| | |
| | * Cleanup OpenPgpService2 code, update openpgp-api libDominik Schürmann2015-08-281-51/+3
| | |
| | * Merge branch 'master' of https://github.com/mgeier63/open-keychain into ↵Dominik Schürmann2015-08-282-61/+188
| | |\ | | | | | | | | | | | | mgeier63-master
| | | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-272-61/+188
| | | |
| * | | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2951-75/+4152
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-162-42/+54
| | | |
| | * | fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-37/+12
| | | |
| | * | linked-ids: remove debug uriVincent Breitmoser2015-05-161-1/+1
| | | |
| | * | allow linked token without one colonVincent Breitmoser2015-05-121-3/+2
| | | |
| | * | rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-125-13/+13
| | | |
| | * | Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1140-384/+692
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * | | linked-ids: small compatibility changesVincent Breitmoser2015-05-112-2/+3
| | | | |
| | * | | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-098-27/+53
| | | | |
| | * | | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-097-25/+25
| | | | |
| | * | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-0911-37/+37
| | | | |
| | * | | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-0922-324/+295
| | | | |
| | * | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 10:05:28 +0000