aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
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-154-52/+104
|
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-1512-423/+430
| | | | mime parsing
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-14352-6313/+26029
|\ | | | | | | | | | | | | | | 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-113-36/+46
| |
| * sort confirmed keys before unconfirmed primary ones (OKC-01-011)Vincent Breitmoser2015-09-111-0/+5
| |
| * fix unit tests for new savePublicKeyRing method signatureVincent Breitmoser2015-09-114-4/+4
| |
| * 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-114-188/+98
| |
| * never import secret keys from keyserver (OKC-01-001)Vincent Breitmoser2015-09-1110-12/+21
| |
| * perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-116-29/+30
| |
| * 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-103-317/+370
| |
| * add test for signed binary data (#1507)Vincent Breitmoser2015-09-101-1/+55
| |
| * linked: improve fragment robustness, save cookies through destroyed fragmentVincent Breitmoser2015-09-101-14/+40
| |
| * linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-105-601/+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-103-39/+47
| |
| * 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-087-5/+30
| |
| * linked: move between fixed statesVincent Breitmoser2015-09-081-10/+56
| |
| * statusindicator: method to set states by nameVincent Breitmoser2015-09-081-0/+9
| |
| * linked: fix button margins in select dialogVincent Breitmoser2015-09-081-3/+6
| |
| * linked: move client id and secret into static vars (build vars later)Vincent Breitmoser2015-09-081-3/+7
| |
| * fix unit test for linked idsVincent Breitmoser2015-09-061-1/+1
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-0622-54/+52
| |\
| | * Merge pull request #1522 from 0-kaladin/mipmapDominik Schürmann2015-09-055-0/+0
| | |\ | | | | | | | | Fixes #1520
| | | * Fixes #1520Kaladin Light2015-09-055-0/+0
| | | | | | | | | | | | | | | | Move debug launcher icons to mipmap
| | * | Use new HashSet<>(Arrays.asList()) instead of staticDominik Schürmann2015-09-041-38/+36
| | |/
| | * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-0316-16/+16
| | | | | | | | | | | | 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-064-4/+41
| | |
| * | linked: basic shared element transitionVincent Breitmoser2015-09-0612-552/+110
| | |
| * | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-027-126/+197
| |/
| * linked: fix back button in github dialogVincent Breitmoser2015-09-012-1/+26
| |
| * linked: order selection dialog alphabeticallyVincent Breitmoser2015-09-011-25/+20
| |
| * 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-013-42/+105
| |
| * fix missing date in CryptoInputParcel in some cases (could be a bigger problem!)Vincent Breitmoser2015-09-011-1/+3
| |
| * linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-016-1/+1
| |
| * linked: update icon design of github l-id creationVincent Breitmoser2015-09-0111-7/+27
| |
| * linked: work on github designVincent Breitmoser2015-09-013-57/+102
| |
| * linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-018-12/+501
| |