cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,410 Commits 1 Branch 0 Tags
d04439df6b8b41b63c95721fd2e930c1eaca3c7e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser d04439df6b ditch passphrase "time to live" setting 2017-09-20 17:02:15 +02:00
Vincent BreitmoserandGitHub 1f2d9c85e0 Merge pull request #2160 from open-keychain/remove-move-to-card 
remove "Move to Card" action from subkey edit ui
 2017-09-13 10:45:54 +02:00
Vincent Breitmoser 12b6d42990 fix untranslatable string 2017-09-12 12:52:54 +02:00
Vincent Breitmoser c6557cc5fd remove "Move to Card" action from subkey edit ui 2017-09-12 02:08:30 +02:00
Vincent BreitmoserandGitHub 68b3923c33 Merge pull request #2157 from open-keychain/token-import 
new Security Token import flow
 2017-09-11 15:52:26 +02:00
Vincent Breitmoser 863651918e token-import: use entire fingerprint for promote operation 2017-09-11 15:30:10 +02:00
Vincent Breitmoser 10eeb5672b token-import: match fingerprints of subkeys 2017-09-11 15:30:06 +02:00
Vincent Breitmoser a1b049993f token-import: look up keys locally by all fingerprints 2017-09-11 03:20:00 +02:00
Vincent Breitmoser bd2e6aa698 token-import: bind only relevant subkeys 2017-09-11 01:55:03 +02:00
Vincent Breitmoser e0b5d97356 token-import: add entrypoint for blank token setup flow 2017-09-11 01:44:50 +02:00
Vincent Breitmoser 19bb4ff83c token-import: don't load fragment multiple times 2017-09-11 01:44:40 +02:00
Vincent Breitmoser bdc855d618 token-import: add debug states for locked keys 2017-09-11 01:44:40 +02:00
Vincent Breitmoser 419dffab02 token-import: move debug states out of fragment 2017-09-11 01:44:39 +02:00
Vincent Breitmoser 646940eb44 token-import: add ui for pin change and unlock 2017-09-11 01:43:20 +02:00
Vincent Breitmoser 36bec236f4 add routines to unlock security token 2017-09-08 15:17:33 +02:00
Vincent Breitmoser 4d0a686220 token-import: show unlock option for locked keys 2017-09-08 15:17:33 +02:00
Vincent Breitmoser 768abb3074 token-import: introduce parcelable SecurityTokenInfo 2017-09-08 15:17:33 +02:00
Vincent Breitmoser f40cebfb21 ditch yubikey fragment in ViewKeyActivity 2017-09-08 15:17:33 +02:00
Vincent Breitmoser 292b35c26d token-import: allow detaching of presenter 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 16d6f07fe7 token-import: handle runtime storage permission 2017-09-08 15:16:50 +02:00
Vincent Breitmoser c1773de1c3 token-import: handle empty urls better 2017-09-08 15:16:50 +02:00
Vincent Breitmoser f1852338af debug: don't consolidate when a key is deleted 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 8ae12e7590 token-import: option to simulate keys for import in debug builds 2017-09-08 15:16:50 +02:00
Vincent Breitmoser fb2a8624a4 token-import: remove old import/reset fragment 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 2d2dce754d fix stupid error in UncachedKeyRing 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 1af6a2796c token-import: change package structure a bit 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 363551723b token-import: add logging 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 050aed1ef5 token-import: extract string resources 2017-09-08 15:16:50 +02:00
Vincent Breitmoser e9efc07b74 token-import: reset yubikey 2017-09-08 15:16:50 +02:00
Vincent Breitmoser bc3031c9eb token-import: load from file 2017-09-08 15:16:50 +02:00
Vincent Breitmoser af7d36c038 token-import: first iteration 2017-09-08 15:16:50 +02:00
Vincent Breitmoser 21bc6f12f0 fix bugs introduced by using byte[] instead of String for fingerprints 2017-09-08 14:50:10 +02:00
Vincent Breitmoser 4a4e325bca encrypt to signing key in openkeychain ui 2017-09-06 22:07:56 +02:00
Vincent Breitmoser 5dd9700b74 fix drawer position glitch 2017-08-29 21:07:53 +02:00
Vincent Breitmoser 0437eb8f1d change text color again in transfer fragment 2017-08-29 20:40:17 +02:00
Vincent Breitmoser e3b1cf7209 slight changes to ui 2017-08-29 20:34:39 +02:00
Vincent Breitmoser 5122c20e3d tls-psk: remove hostname from status message 2017-08-29 20:11:38 +02:00
Vincent Breitmoser c6c1222eed tls-psk: add link from secret key view 2017-08-29 20:11:37 +02:00
Vincent Breitmoser 33313824ce tls-psk: rename to Secure Wifi Transfer 2017-08-29 20:11:37 +02:00
Vincent Breitmoser ba5a1a1969 tls-psk: add specialized error screen if on bad wifi 2017-08-29 20:11:37 +02:00
Vincent Breitmoser 9a37fabb45 tls-psk: switch layouts in animator by id 2017-08-29 20:11:37 +02:00
Vincent Breitmoser f76a0f47b5 tls-psk: fix scan from proxy activity, and use Constants.SKT_SCHEME everywhere 2017-08-29 20:11:37 +02:00
Vincent Breitmoser 4f5f5219bd tls-psk: include wifi ssid in qr code (if available) 2017-08-29 20:11:37 +02:00
Vincent Breitmoser b92778f6e9 tls-psk: extract skt uri handling, and use new qr code format 2017-08-29 20:11:36 +02:00
Vincent Breitmoser e5189e0c39 tls-psk: fix bug with zero size layout 2017-08-29 20:11:36 +02:00
Vincent Breitmoser 23b1f6d7e5 tls-psk: add "more info" button 2017-08-29 20:11:36 +02:00
Vincent Breitmoser 0aa878d1a9 tls-psk: move descriptive text, fix typo 2017-08-29 20:11:36 +02:00
Vincent Breitmoser 39be6b166d tls-psk: show warning dialog before actually sending a key 2017-08-29 20:11:36 +02:00
Vincent Breitmoser b6586c6620 tls-psk: show a "done" button after connection is established 2017-08-29 20:11:36 +02:00
Vincent Breitmoser c04e716a27 tls-psk: add secure device setup to first time dialog 2017-08-29 20:11:35 +02:00
Vincent Breitmoser b58e30914c tls-psk: stub for tests 2017-08-29 20:11:35 +02:00
Vincent Breitmoser dc350cff50 tls-psk: properly set timeout while connecting 2017-08-29 20:11:35 +02:00
Vincent Breitmoser 34a466622e tls-psk: show "Connecting…" view while waiting 2017-08-29 20:11:35 +02:00
Vincent Breitmoser ca43544a0e tls-psk: handle scan from ImportKeysProxyActivity 2017-08-29 20:11:35 +02:00
Vincent Breitmoser af1d028520 tls-psk: show error message for unspecialized io exception 2017-08-29 20:11:35 +02:00
Vincent Breitmoser fa3a82ded2 tls-psk: reformat getIPAddress method 2017-08-29 20:11:35 +02:00
Vincent Breitmoser e470072210 tls-psk: move more magic values into constants 2017-08-29 20:11:34 +02:00
Vincent Breitmoser db3210e67c tls-psk: use ascii armor block delimiter 2017-08-29 20:11:34 +02:00
Vincent Breitmoser e2c3f5b6f8 tls-psk: show animated connection status view 2017-08-29 20:11:34 +02:00
Vincent Breitmoser 049b93ff03 tls-psk: display a note if there are no keys to send 2017-08-29 20:11:34 +02:00
Vincent Breitmoser 5cff30e7ba tls-psk: ignore incoming data if we already sent a key 2017-08-29 20:11:34 +02:00
Vincent Breitmoser b95e42f693 tls-psk: handle disconnect by local decision 2017-08-29 20:11:34 +02:00
Vincent Breitmoser 4846ee5328 tls-psk: put QR code in card 2017-08-29 20:11:34 +02:00
Vincent Breitmoser 3a728b94a6 tls-psk: use automatically assigned port 2017-08-29 20:11:34 +02:00
Vincent Breitmoser 8a345d0c72 tls-psk: use hex encoding for psk instead of base64 2017-08-29 20:11:34 +02:00
Vincent Breitmoser c494c3f70f tls-psk: return identity hint as client identity 
this is necessary for openssl, which expects "Client_identity" as
default client identity hint
 2017-08-29 20:11:34 +02:00
Vincent Breitmoser 41fdbd65ec tls-psk: improve error handling 2017-08-29 20:11:33 +02:00
Vincent Breitmoser e5931637dc tls-psk: only enable TLS_DHE_PSK_* and TLS_ECDHE_PSK_* cipher suites 2017-08-29 20:11:33 +02:00
Vincent Breitmoser f35a707d82 tls-psk: add compatibility fragment for android < 5 2017-08-29 20:11:33 +02:00
Vincent Breitmoser 99441660ca tls-psk: some cleanup 2017-08-29 20:11:33 +02:00
Vincent Breitmoser a919bb3a9e tls-psk: fade between drawer fragments 2017-08-29 20:11:33 +02:00
Vincent Breitmoser 3ca3baf780 tls-psk: fix drawer icon and text 2017-08-29 20:11:33 +02:00
Vincent Breitmoser 7df2619232 tls-psk: improve error handling on connection error 2017-08-29 20:11:33 +02:00
Vincent Breitmoser a441df2bd7 tls-psk: display warning if not connected to wifi before connecting 2017-08-29 20:11:33 +02:00
Vincent Breitmoser 13873e934f tls-psk: clear all data on connection reset 2017-08-29 20:11:33 +02:00
Vincent Breitmoser f4d9d0a7c0 tls-psk: handle back button 2017-08-29 20:11:33 +02:00
Vincent Breitmoser b14674749b tls-psk: handle disconnect in ui 2017-08-29 20:11:33 +02:00
Vincent Breitmoser 703603782f tls-psk: actual import of keys 2017-08-29 20:04:48 +02:00
Vincent Breitmoser e44d668e27 tls-psk: display list of incoming keys on receiving side 2017-08-29 20:03:02 +02:00
Vincent Breitmoser fd34740c1a tls-psk: allow passing more than one key 2017-08-29 20:03:02 +02:00
Vincent Breitmoser 9b20c97e01 tls-psk: use inline progress animation 2017-08-29 20:03:02 +02:00
Vincent Breitmoser 0c3a247d9e tls-psk: working version, with fake progress too! 2017-08-29 20:03:02 +02:00
Vincent Breitmoser 747feaa100 tls-psk: use unified KeyTransferInteractor, display list of keys 2017-08-29 20:03:02 +02:00
Vincent Breitmoser 9b3dd27ffd tls-psk: second steps 2017-08-29 20:03:02 +02:00
Vincent Breitmoser a55445f5bb tls-psk: first steps 2017-08-29 20:03:02 +02:00
Vincent Breitmoser 6e8a768011 close database when cursor is closed for external provider 2017-08-29 19:38:25 +02:00
Vincent Breitmoser b450909300 don't close db in ContentProvider 2017-08-29 19:28:08 +02:00
Vincent Breitmoser d3746b89e5 respect most recent sig with actual key flags, if available 2017-08-29 01:46:19 +02:00
Vincent Breitmoser b7968d6279 don't encrypt twice to the same key if additional encryption id is in recipient list 2017-08-28 17:36:30 +02:00
Vincent Breitmoser 5c4e227b89 update openpgp api lib 
necessary for 4671cefaa1
 2017-08-28 17:14:48 +02:00
Vincent Breitmoser 7070678d2e small improvement for app registration screen 2017-08-25 16:17:20 +02:00
Vincent Breitmoser 4671cefaa1 pass key confirmation status through for autocrypt status query 2017-08-24 16:11:30 +02:00
Vincent Breitmoser 6d99abf5eb make database upgrade path more reliable 2017-08-04 13:08:44 +02:00
Vincent Breitmoser 010e612f85 fix trivial NPE (fixes #2142) 2017-08-04 11:55:30 +02:00
Vincent Breitmoser b94a8c9dee remove nfc key transfer feature, this was broken anyways 2017-08-02 22:13:05 +02:00
Vincent Breitmoser 4e920afe94 rewrite NfcHelper 2017-08-02 22:05:54 +02:00
Vincent Breitmoser 93d7b3bdf3 pass through data correctly in new remote activities 2017-07-26 00:52:10 +02:00
Vincent Breitmoser 553682582c fix migration 2017-07-25 23:19:30 +02:00
Vincent Breitmoser dfa4375697 fix and add some more tests for external provider 2017-07-25 22:19:33 +02:00
Vincent Breitmoser 5da3ae7e62 update openpgp-api lib 2017-07-25 22:19:33 +02:00