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

5238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser
004c944bb7 Merge remote-tracking branch 'origin/master' 2015-11-13 17:00:14 +01:00
Vincent Breitmoser
712e526ab5 Merge commit '816dce0334e8b8d9da3cb00d31d26033b17040a3' 2015-11-13 17:00:09 +01:00
Vincent Breitmoser
2d7dada888 decrypt: skip unavailable and unsuitable keys 2015-11-13 16:58:26 +01:00
Dominik Schürmann
ad03031d24 Update safeslinger lib 2015-11-13 15:15:27 +01:00
Dominik Schürmann
dd5d3dbf4c Update support libs to 23.1.1 2015-11-13 15:01:51 +01:00
Dominik Schürmann
4a8a4e37d0 Use fixed version of mockito 2015-11-13 14:59:45 +01:00
Vincent Breitmoser
816dce0334 service: minor code cleanups in key retrieval 2015-11-09 02:10:13 +01:00
Vincent Breitmoser
cf8d61f41e Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-09 02:05:12 +01:00
Dominik Schürmann
d6a1be825c Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-08 20:02:54 +01:00
Dominik Schürmann
89d016c49b Get whole public key via ACTION_GET_KEY 2015-11-08 20:02:50 +01:00
Dominik Schürmann
2f640980dd Cleanup settings activity 2015-11-08 19:29:51 +01:00
Vincent Breitmoser
5c47570e90 import: apply fixPgpMessage to text for import from clipboard 2015-11-06 12:09:27 +01:00
Vincent Breitmoser
33e8699be5 bench: add simple s2k benchmark (iterations for 100ms) 2015-11-04 21:27:24 +01:00
Vincent Breitmoser
0a266cdb4a bench: run ops multiple times and for an average time 2015-11-04 20:44:35 +01:00
Vincent Breitmoser
3ca8af060b Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-04 20:24:11 +01:00
Vincent Breitmoser
a4518c43c2 bench: simple working benchmark 2015-11-04 20:24:06 +01:00
Vincent Breitmoser
8feed0b097 bench: add benchmark operation for testing 2015-11-04 19:09:51 +01:00
Dominik Schürmann
31a45759cc Add READ_EXTERNAL_STORAGE permission 2015-11-03 10:59:53 +01:00
Dominik Schürmann
8f070e2450 Support for Android 6 ACTION_PROCESS_TEXT 2015-11-02 19:16:24 +01:00
Dominik Schürmann
00c972b6a8 Properly hide fab in ViewKeyActivity, fixes #1580 2015-11-02 18:24:59 +01:00
Dominik Schürmann
989df66d18 Add travis components for SDK 23 2015-11-02 18:12:05 +01:00
Dominik Schürmann
59e3122731 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-02 18:10:05 +01:00
Dominik Schürmann
ccdfd55f61 Add runtime permission check for QR Code activity 2015-11-02 18:10:00 +01:00
Dominik Schürmann
05df0a63b7 Fix API 23 regression for activities without layout, see http://stackoverflow.com/q/32169303 2015-11-02 18:09:41 +01:00
Dominik Schürmann
c31f760110 Merge pull request #1578 from open-keychain/keyserver-sync-fix 
Reworked KeyserverSyncAdapterService
 2015-11-02 18:03:25 +01:00
Vincent Breitmoser
3411a5c087 keylist: add "search for query" button to empty view 2015-11-02 15:57:35 +01:00
Adithya Abraham Philip
4284aac0aa changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT 2015-10-31 00:21:13 +05:30
Dominik Schürmann
0641b9cba6 comment git dependency again 2015-10-29 23:03:11 +01:00
Dominik Schürmann
fbca191c8f update material drawer library 2015-10-29 23:01:16 +01:00
Vincent Breitmoser
e45636c07a import: make operation cancelable (again), make "update all" cancelable 
(also, use unbounded blocking queue to fix update of more than 10 keys)
 2015-10-29 18:22:04 +01:00
Vincent Breitmoser
55e22e68b4 import: reduce number of threads a little, and code cleanup 2015-10-29 17:14:22 +01:00
Vincent Breitmoser
ee79cc76d3 make use of proxies a Keyserver property 2015-10-29 16:58:20 +01:00
Vincent Breitmoser
1c83c33d35 editkey: always return EditKeyResult 2015-10-29 16:01:24 +01:00
Vincent Breitmoser
a665dd60fb use Proxy.NO_PROXY instead of null value for no proxy 2015-10-29 15:43:16 +01:00
Vincent Breitmoser
64a09a8945 encrypttext: fix mimetype check logic (#1574) 2015-10-29 15:08:57 +01:00
Vincent Breitmoser
a1330f78e4 uploadop: clean up, add logging 2015-10-29 14:50:29 +01:00
Vincent Breitmoser
e89dba8f24 prevent crashes in EncryptKeyCompletionView (2) 2015-10-26 21:57:31 +01:00
Dominik Schürmann
67a51cdfe3 Target SDK 23 and related fixes 2015-10-26 20:53:32 +01:00
Dominik Schürmann
33fea901e9 Update stickylistheaders, html-textview 2015-10-26 20:25:55 +01:00
Dominik Schürmann
cf28da39c4 Update tokenautocomplete 2015-10-26 20:21:35 +01:00
Dominik Schürmann
ddc0315b45 Update android-patternview, materialtabstrip, floatingactionbutton 2015-10-26 20:09:41 +01:00
Dominik Schürmann
96bed5ef1a Update zxing-android-embedded with new custom activity 2015-10-26 19:58:56 +01:00
Dominik Schürmann
c04c698992 Version 3.6.1 2015-10-26 19:10:23 +01:00
Dominik Schürmann
65c402fbe0 Pull from transifex 2015-10-26 19:09:30 +01:00
Vincent Breitmoser
c55ca09a06 import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadException 2015-10-26 15:28:53 +01:00
Vincent Breitmoser
10407d34de decrypt: restart operation if interrupted by fragment recreation 2015-10-26 14:40:40 +01:00
Vincent Breitmoser
968d051877 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-10-26 13:48:25 +01:00
Vincent Breitmoser
cab52c4013 fix FileHelper class for pre-lollipop devices 2015-10-26 12:52:39 +01:00
Dominik Schürmann
6a04866ae6 Commit Github tokens 2015-10-26 12:29:05 +01:00
Dominik Schürmann
cae76455d4 https everywhere 2015-10-25 22:53:43 +01:00