Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add text icon in decrypt list | Dominik Schürmann | 2015-09-16 | 1 | -1/+3 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | ||||
* | multidecrypt: display all outputUris as individual items | Vincent Breitmoser | 2015-09-16 | 1 | -14/+42 |
| | |||||
* | multidecrypt: prepare viewholder for file list | Vincent Breitmoser | 2015-09-16 | 1 | -38/+58 |
| | |||||
* | multidecrypt: put drawable cache in map attribute | Vincent Breitmoser | 2015-09-16 | 1 | -41/+44 |
| | |||||
* | fix messed up imports | Vincent Breitmoser | 2015-09-16 | 1 | -2/+3 |
| | |||||
* | multidecrypt: change some method params, prepare for open/share of other outputs | Vincent Breitmoser | 2015-09-16 | 1 | -29/+16 |
| | |||||
* | multidecrypt: don't pass context to adapter | Vincent Breitmoser | 2015-09-16 | 2 | -25/+34 |
| | |||||
* | multidecrypt: inline setOnClickListener | Vincent Breitmoser | 2015-09-16 | 1 | -46/+26 |
| | |||||
* | preliminary working mime parsing in DecryptListFragment! (beware WIP, here ↵ | Vincent Breitmoser | 2015-09-16 | 1 | -39/+42 |
| | | | | be dragons!) | ||||
* | mime: create more general InputDataOperation, which for now and does basic ↵ | Vincent Breitmoser | 2015-09-15 | 1 | -3/+0 |
| | | | | mime parsing | ||||
* | Merge branch 'master' into mime4j | Vincent Breitmoser | 2015-09-14 | 53 | -1200/+3869 |
|\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | fix up navigation in keyserver select (fixes #1482) | Vincent Breitmoser | 2015-09-11 | 2 | -3/+17 |
| | | |||||
| * | no chooser before DisplayTextActivity, can select from there (#1524) | Vincent Breitmoser | 2015-09-11 | 1 | -17/+4 |
| | | |||||
| * | add share item to decrypt file list (#1524) | Vincent Breitmoser | 2015-09-11 | 1 | -35/+39 |
| | | |||||
| * | share rather than save log files (OKC-01-015) | Vincent Breitmoser | 2015-09-11 | 1 | -158/+31 |
| | | |||||
| * | linked: improve fragment robustness, save cookies through destroyed fragment | Vincent Breitmoser | 2015-09-10 | 1 | -14/+40 |
| | | |||||
| * | linked: ditch create dns fragment (for now) | Vincent Breitmoser | 2015-09-10 | 2 | -301/+0 |
| | | |||||
| * | linked: move github client id and secret into build vars | Vincent Breitmoser | 2015-09-10 | 1 | -8/+5 |
| | | |||||
| * | linked: localization for github creation | Vincent Breitmoser | 2015-09-10 | 1 | -19/+16 |
| | | |||||
| * | linked: don't need javascript, so we don't enable it | Vincent Breitmoser | 2015-09-10 | 1 | -1/+0 |
| | | |||||
| * | linked: fix screwups from last commit, sigh | Vincent Breitmoser | 2015-09-10 | 1 | -9/+17 |
| | | |||||
| * | linked: work on github lid creation error handling | Vincent Breitmoser | 2015-09-10 | 1 | -38/+125 |
| | | |||||
| * | linked: fix auth token revocation (maybe?) | Vincent Breitmoser | 2015-09-08 | 1 | -1/+5 |
| | | |||||
| * | linked: add "retry" | Vincent Breitmoser | 2015-09-08 | 1 | -3/+17 |
| | | |||||
| * | linked: move between fixed states | Vincent Breitmoser | 2015-09-08 | 1 | -10/+56 |
| | | |||||
| * | statusindicator: method to set states by name | Vincent Breitmoser | 2015-09-08 | 1 | -0/+9 |
| | | |||||
| * | linked: move client id and secret into static vars (build vars later) | Vincent Breitmoser | 2015-09-08 | 1 | -3/+7 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-06 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixes open-keychain/open-keychain#1515 | Kaladin Light | 2015-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Move launcher icons to mipmap | ||||
| * | | linked: clear cookies and don't save form data in oauth webview | Vincent Breitmoser | 2015-09-06 | 1 | -1/+5 |
| | | | |||||
| * | | linked: fix "navigate up" in LinkedIdWizard (imperfect) | Vincent Breitmoser | 2015-09-06 | 3 | -3/+38 |
| | | | |||||
| * | | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 7 | -270/+105 |
| | | | |||||
| * | | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 2 | -99/+171 |
| |/ | |||||
| * | statusindicator: don't redisplay child with animation if already shown | Vincent Breitmoser | 2015-09-01 | 1 | -0/+6 |
| | | |||||
| * | linked: smooth over progress with tactical pauses | Vincent Breitmoser | 2015-09-01 | 1 | -19/+23 |
| | | |||||
| * | linked: redesign github resource creation, implement ouath flow | Vincent Breitmoser | 2015-09-01 | 2 | -11/+74 |
| | | |||||
| * | fix missing date in CryptoInputParcel in some cases (could be a bigger problem!) | Vincent Breitmoser | 2015-09-01 | 1 | -1/+3 |
| | | |||||
| * | linked: work on github design | Vincent Breitmoser | 2015-09-01 | 2 | -12/+56 |
| | | |||||
| * | linked: redesign github resource creation, implement ouath flow (WIP) | Vincent Breitmoser | 2015-09-01 | 4 | -9/+316 |
| | | |||||
| * | add simple StatusIndicator widget | Vincent Breitmoser | 2015-09-01 | 1 | -0/+25 |
| | | |||||
| * | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 1 | -0/+2 |
| | | |||||
| * | Show linked identity menu item and linked identities only when feature is ↵ | Dominik Schürmann | 2015-08-29 | 2 | -5/+9 |
| | | | | | | | | enabled | ||||
| * | Reword experimental settings | Dominik Schürmann | 2015-08-29 | 1 | -2/+4 |
| | | |||||
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 34 | -45/+2807 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 2 | -42/+54 |
| | | | |||||
| | * | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -37/+12 |
| | | | |||||
| | * | linked-ids: remove debug uri | Vincent Breitmoser | 2015-05-16 | 1 | -1/+1 |
| | | | |||||
| | * | rename LinkedIdentity to LinkedAttribute | Vincent Breitmoser | 2015-05-12 | 3 | -9/+9 |
| | | | |||||
| | * | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 26 | -290/+367 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 changes | Vincent Breitmoser | 2015-05-11 | 1 | -1/+1 |
| | | | |