cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,012 Commits 1 Branch 0 Tags
5e0c40346eff669370be2bb0358dd878059e7092
Commit Graph

1558 Commits

Author SHA1 Message Date
Vincent Breitmoser
5e0c40346e multidecrypt: attempt file deletion only once at most 2015-09-16 20:57:46 +02:00
Vincent Breitmoser
4722ecb955 actually use cleaned text if we read from clipboard 2015-09-16 20:36:19 +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
97c55ee4bb multidecrypt: context menu per card, not per file 2015-09-16 17:47:16 +02:00
Dominik Schürmann
ce105d955f Add text icon in decrypt list 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
 2015-09-16 17:21:38 +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
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
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
cdf67c3296 share rather than save log files (OKC-01-015) 2015-09-11 03:08:53 +02:00
Vincent Breitmoser
cb9a66e246 linked: improve fragment robustness, save cookies through destroyed fragment 2015-09-10 16:57:07 +02:00
Vincent Breitmoser
c6f1f505bb linked: ditch create dns fragment (for now) 2015-09-10 12:17:25 +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
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
a5eea6c200 linked: move client id and secret into static vars (build vars later) 2015-09-08 14:46:18 +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
Kaladin Light
dd850e5c72 Fixes open-keychain/open-keychain#1515 
Move launcher icons to mipmap
 2015-09-03 13:25:09 -04:00
Vincent Breitmoser
2cda486427 linked: use webview instead of app, and some minor layoutings 2015-09-02 04:14:45 +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
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
ee81018163 linked: disable DNS resource (for now) 2015-08-31 13:47:00 +02:00
Dominik Schürmann
bff302f808 Show linked identity menu item and linked identities only when feature is enabled 2015-08-29 17:27:04 +02:00
Dominik Schürmann
feef4a93ab Reword experimental settings 2015-08-29 17:19:58 +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