aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Collapse)AuthorAgeFilesLines
* preliminary working mime parsing in DecryptListFragment! (beware WIP, here ↵Vincent Breitmoser2015-09-164-50/+66
| | | | be dragons!)
* mime: add logging to InputDataOperationVincent Breitmoser2015-09-152-49/+92
|
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-159-420/+261
| | | | mime parsing
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-1495-2010/+6888
|\ | | | | | | | | | | | | | | 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 Breitmoser2015-09-112-3/+17
| |
| * no chooser before DisplayTextActivity, can select from there (#1524)Vincent Breitmoser2015-09-111-17/+4
| |
| * add share item to decrypt file list (#1524)Vincent Breitmoser2015-09-111-35/+39
| |
| * sort confirmed keys before unconfirmed primary ones (OKC-01-011)Vincent Breitmoser2015-09-111-0/+5
| |
| * strip encrypted filenames to basenames (OKC-01-004)Vincent Breitmoser2015-09-111-0/+3
| |
| * share rather than save log files (OKC-01-015)Vincent Breitmoser2015-09-112-175/+94
| |
| * never import secret keys from keyserver (OKC-01-001)Vincent Breitmoser2015-09-112-4/+12
| |
| * perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-115-27/+28
| |
| * complain about mdc insecurity status only if data actually was encryptedVincent Breitmoser2015-09-101-15/+16
| |
| * add support for signed-only data in the backend (#1507)Vincent Breitmoser2015-09-102-317/+369
| |
| * linked: improve fragment robustness, save cookies through destroyed fragmentVincent Breitmoser2015-09-101-14/+40
| |
| * linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-102-301/+0
| |
| * linked: deprecate unused method, for nowVincent Breitmoser2015-09-101-1/+2
| |
| * 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