cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,035 Commits 1 Branch 0 Tags
4c1d48bd951cbc302bdb2821bdfd501405f3abe0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 4c1d48bd95 use intent icon as fallback if we get no thumbnail 2015-09-19 15:45:20 +02:00
Vincent Breitmoser 35eee40d70 inform storage provider of uri content-type for decrypted output 2015-09-19 15:45:00 +02:00
Vincent Breitmoser 5330a91fef skip mime parsing if we already know the content type isn't suitable 2015-09-19 15:27:14 +02:00
Vincent Breitmoser e7185bd1b8 fix fallback for non-mime data 2015-09-19 15:27:04 +02:00
Vincent 448140c276 Update README.md 2015-09-18 16:11:37 +02:00
Vincent 2d54c3f928 Merge pull request #1538 from bashrc/bashrc/build 
Fix build instruction
 2015-09-18 15:53:17 +02:00
Vincent 2ebcc942d4 Merge pull request #1487 from open-keychain/mime4j 
support multipart mime structure in decrypted data
 2015-09-18 14:11:49 +02:00
Vincent Breitmoser 8ad31e3251 mime: skip trailing unsigned parts, and ignore nested signed data 2015-09-17 22:13:20 +02:00
Vincent Breitmoser 955a1f4b26 mime: support for signed-then-encrypted format 2015-09-17 21:51:11 +02:00
Vincent Breitmoser fdb1a7384e multidcrypt: display k9 download only after decryption failure 2015-09-17 19:48:51 +02:00
Vincent Breitmoser ff2c552aa2 white share icon in log display activity 2015-09-17 16:17:32 +02:00
Vincent Breitmoser bbbc8dfd86 multidecrypt: black share icon in bottom sheet 2015-09-17 16:17:17 +02:00
Vincent Breitmoser 142a71480e Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4j 2015-09-17 13:45:32 +02:00
Vincent Breitmoser 7da80c84b7 multidecrypt: use chooser intent on click for everything but text/plain ACTION_SHOW 2015-09-17 13:45:09 +02:00
Vincent Breitmoser f77a6a85ee mime: don't decrypt in mime parsing only test 2015-09-17 00:54:33 +02:00
Vincent Breitmoser 1b8cdf5462 update openpgp-api-lib with OpenPgpMetadata changes 2015-09-16 22:58:23 +02:00
Vincent Breitmoser d5bde6997e fail with warning if we get data from the AOSP mail client (see #290) 2015-09-16 21:03:49 +02:00
Vincent Breitmoser 5e0c40346e multidecrypt: attempt file deletion only once at most 2015-09-16 20:57:46 +02:00
Vincent Breitmoser 76465fc687 mime: add failure case if openpgp processing fails! 2015-09-16 20:48:46 +02:00
Vincent Breitmoser 01038d6a26 mime: add logging messages 2015-09-16 20:45:12 +02:00
Vincent Breitmoser 4722ecb955 actually use cleaned text if we read from clipboard 2015-09-16 20:36:19 +02:00
Vincent Breitmoser 93421e902c mime: handle non-mime data, just pass it through 2015-09-16 20:36:06 +02:00
Vincent Breitmoser 38a27855a9 multidecrypt: disable delete if not from ACTION_VIEW 2015-09-16 20:07:04 +02:00
Vincent Breitmoser 6624d1f830 mime: respect charset header (default to utf-8) 2015-09-16 19:54:57 +02:00
Vincent Breitmoser ece06b1933 multidecrypt: use bottom sheet for longclick options 2015-09-16 19:52:26 +02:00
Vincent Breitmoser 9ac7b33a4e enable view intent with text/plain (related #290) 2015-09-16 17:47:44 +02:00
Vincent Breitmoser 97c55ee4bb multidecrypt: context menu per card, not per file 2015-09-16 17:47:16 +02:00
Vincent Breitmoser 24f2a9468c multidecrypt: display all outputUris as individual items 2015-09-16 02:56:14 +02:00
Vincent Breitmoser 81ce075df9 multidecrypt: prepare viewholder for file list 2015-09-16 02:19:23 +02:00
Vincent Breitmoser 5ac939387f multidecrypt: put drawable cache in map attribute 2015-09-16 02:11:13 +02:00
Vincent Breitmoser f90f86ae04 fix messed up imports 2015-09-16 01:52:45 +02:00
Vincent Breitmoser 258e2e9a88 multidecrypt: change some method params, prepare for open/share of other outputs 2015-09-16 01:49:42 +02:00
Vincent Breitmoser 0ed0ba88f9 mime: return one OpenPgpMetadata object per body part 2015-09-16 01:34:21 +02:00
Vincent Breitmoser 96865ccbaa multidecrypt: don't pass context to adapter 2015-09-16 01:20:16 +02:00
Vincent Breitmoser 13509a0b90 multidecrypt: inline setOnClickListener 2015-09-16 01:14:40 +02:00
Vincent Breitmoser 99fd1f4c22 preliminary working mime parsing in DecryptListFragment! (beware WIP, here be dragons!) 2015-09-16 00:05:21 +02:00
Vincent Breitmoser 326834fd58 mime: add logging to InputDataOperation 2015-09-15 23:06:15 +02:00
Vincent Breitmoser 3cd54581c3 mime: create more general InputDataOperation, which for now and does basic mime parsing 2015-09-15 03:02:05 +02:00
Vincent Breitmoser 3814ae7d53 Merge branch 'master' into mime4j 
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
 2015-09-14 16:21:04 +02:00
Vincent Breitmoser d5dd6a49c8 fix up navigation in keyserver select (fixes #1482) 2015-09-11 13:29:59 +02:00
Vincent Breitmoser 0d46a589e5 no chooser before DisplayTextActivity, can select from there (#1524) 2015-09-11 04:59:00 +02:00
Vincent Breitmoser fd6141f0d2 add share item to decrypt file list (#1524) 2015-09-11 04:51:55 +02:00
Vincent Breitmoser 486117d9de sort confirmed keys before unconfirmed primary ones (OKC-01-011) 2015-09-11 03:56:07 +02:00
Vincent Breitmoser 476d153db2 fix unit tests for new savePublicKeyRing method signature 2015-09-11 03:35:30 +02:00
Vincent Breitmoser aad606c47f strip encrypted filenames to basenames (OKC-01-004) 2015-09-11 03:30:10 +02:00
Vincent Breitmoser cdf67c3296 share rather than save log files (OKC-01-015) 2015-09-11 03:08:53 +02:00
Vincent Breitmoser b76aa7fe11 never import secret keys from keyserver (OKC-01-001) 2015-09-11 02:05:17 +02:00
Vincent Breitmoser 9d97d37c06 perform fingerprint check after canonicalization (OKC-01-009) 2015-09-11 01:57:17 +02:00
Vincent Breitmoser 950409ce55 complain about mdc insecurity status only if data actually was encrypted 2015-09-10 22:36:07 +02:00
Vincent Breitmoser b78954fc16 add support for signed-only data in the backend (#1507) 2015-09-10 21:44:15 +02:00
Vincent Breitmoser cb067f748b add test for signed binary data (#1507) 2015-09-10 21:38:37 +02:00
Vincent Breitmoser cb9a66e246 linked: improve fragment robustness, save cookies through destroyed fragment 2015-09-10 16:57:07 +02:00
Vincent Breitmoser 9ac150eae0 linked: fix client secret paste error 2015-09-10 16:29:16 +02:00
Vincent Breitmoser c6f1f505bb linked: ditch create dns fragment (for now) 2015-09-10 12:17:25 +02:00
Vincent Breitmoser 8a1a62692b linked: deprecate unused method, for now 2015-09-10 12:12:35 +02:00
Vincent Breitmoser ceefa96076 linked: move github client id and secret into build vars 2015-09-10 12:10:24 +02:00
Vincent Breitmoser 36f7ef2808 enable incremental and jumboMode for dexing, speeds up process considerably 2015-09-10 11:47:28 +02:00
Vincent Breitmoser 178aea6b90 linked: localization for github creation 2015-09-10 11:46:31 +02:00
Vincent Breitmoser 9fd5e966f6 linked: don't need javascript, so we don't enable it 2015-09-10 02:23:49 +02:00
Vincent Breitmoser 0f4af7d2ed linked: fix screwups from last commit, sigh 2015-09-10 02:11:43 +02:00
Vincent Breitmoser 7fa1afe430 linked: work on github lid creation error handling 2015-09-10 01:45:59 +02:00
Vincent Breitmoser cf7035ccbe linked: fix auth token revocation (maybe?) 2015-09-08 15:55:21 +02:00
Vincent Breitmoser c07e029345 linked: add "retry" 2015-09-08 15:55:17 +02:00
Vincent Breitmoser 0ef929fb7f linked: move between fixed states 2015-09-08 15:53:05 +02:00
Vincent Breitmoser 0db1495ea1 statusindicator: method to set states by name 2015-09-08 15:51:27 +02:00
Vincent Breitmoser bb7efe0ce9 linked: fix button margins in select dialog 2015-09-08 15:51:01 +02:00
Vincent Breitmoser a5eea6c200 linked: move client id and secret into static vars (build vars later) 2015-09-08 14:46:18 +02:00
Vincent Breitmoser 79f6ade240 fix unit test for linked ids 2015-09-06 01:29:39 +02:00
Vincent Breitmoser d2ce770c1a Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-06 00:59:12 +02:00
Vincent Breitmoser 8e60bf70a1 linked: clear cookies and don't save form data in oauth webview 2015-09-06 00:59:06 +02:00
Vincent Breitmoser 31cfbdc5d2 linked: fix "navigate up" in LinkedIdWizard (imperfect) 2015-09-06 00:58:13 +02:00
Vincent Breitmoser 60e9141b86 linked: basic shared element transition 2015-09-06 00:49:19 +02:00
Vincent Breitmoser 2cda486427 linked: use webview instead of app, and some minor layoutings 2015-09-02 04:14:45 +02:00
Vincent Breitmoser 87f7fe65a8 linked: fix back button in github dialog 2015-09-01 14:11:04 +02:00
Vincent Breitmoser 19c9fcc2c9 linked: order selection dialog alphabetically 2015-09-01 14:07:04 +02:00
Vincent Breitmoser 676b393542 statusindicator: don't redisplay child with animation if already shown 2015-09-01 13:59:17 +02:00
Vincent Breitmoser 1b3f70073a linked: smooth over progress with tactical pauses 2015-09-01 13:58:52 +02:00
Vincent Breitmoser 6225c940f9 linked: redesign github resource creation, implement ouath flow 2015-09-01 13:58:04 +02:00
Vincent Breitmoser 47ef8cbe55 fix missing date in CryptoInputParcel in some cases (could be a bigger problem!) 2015-09-01 13:48:49 +02:00
Vincent Breitmoser 2aa424dd4d linked: use link icon from octo set? not sure yet.. 2015-09-01 07:46:37 +02:00
Vincent Breitmoser 66b9c167d6 linked: update icon design of github l-id creation 2015-09-01 07:37:49 +02:00
Vincent Breitmoser 3e55fca0e5 linked: work on github design 2015-09-01 07:09:53 +02:00
Vincent Breitmoser b52a0303ca linked: redesign github resource creation, implement ouath flow (WIP) 2015-09-01 06:42:10 +02:00
Vincent Breitmoser 9668abfe9e add simple StatusIndicator widget 2015-09-01 06:40:28 +02:00
Vincent Breitmoser 261c83043b linked: Github -> GitHub (fixes #1513) 2015-08-31 14:24:13 +02:00
Vincent Breitmoser 36f8e9f563 linked: fix small typo 2015-08-31 13:48:40 +02:00
Vincent Breitmoser ee81018163 linked: disable DNS resource (for now) 2015-08-31 13:47:00 +02:00
Vincent Breitmoser c1cc27366c move stray test file to correct position 2015-08-29 13:36:35 +02:00
Vincent Breitmoser e037b78248 Merge remote-tracking branch 'origin/master' 2015-08-29 13:29:51 +02:00
Vincent Breitmoser a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
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
 2015-08-29 13:28:56 +02:00
Vincent Breitmoser 79a519aba9 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-27 23:58:01 +02:00
Vincent Breitmoser 5acdef6551 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-27 16:34:17 +02:00
Vincent Breitmoser e7991e8dc8 use nicer filenames during export 2015-08-27 16:34:08 +02:00
Vincent Breitmoser 9e3c041549 some cleanup in FileHelper, and allow input of filename during export 2015-08-27 16:13:32 +02:00
Vincent Breitmoser e3d1f68e79 trigger indexing of file after operation (#1498) 2015-08-22 12:54:19 +02:00
Vincent Breitmoser 16903357e1 mention filename to export to in log 2015-08-22 12:22:43 +02:00
Vincent Breitmoser b082fe403d Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-17 12:39:13 +02:00
Vincent Breitmoser 3c8028fc88 apply fixPgpMessage to plaintext/armored decrypt input 2015-08-17 12:38:46 +02:00
Vincent Breitmoser 7004d129a8 display dummy key for empty result, don't display during search 2015-08-14 15:00:19 +02:00
Vincent Breitmoser b2d447ab32 show dummy item if there are no secret keys 2015-08-14 14:47:20 +02:00