PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Commit graph

  • c1773de1c3 token-import: handle empty urls better Vincent Breitmoser 2017-09-05 20:28:09 +02:00
  • f1852338af debug: don't consolidate when a key is deleted Vincent Breitmoser 2017-09-05 19:48:25 +02:00
  • 8ae12e7590 token-import: option to simulate keys for import in debug builds Vincent Breitmoser 2017-09-05 19:45:21 +02:00
  • fb2a8624a4 token-import: remove old import/reset fragment Vincent Breitmoser 2017-09-05 19:06:38 +02:00
  • 2d2dce754d fix stupid error in UncachedKeyRing Vincent Breitmoser 2017-09-05 18:59:44 +02:00
  • 1af6a2796c token-import: change package structure a bit Vincent Breitmoser 2017-09-05 14:24:03 +02:00
  • 363551723b token-import: add logging Vincent Breitmoser 2017-09-05 05:15:21 +02:00
  • 050aed1ef5 token-import: extract string resources Vincent Breitmoser 2017-09-05 03:22:11 +02:00
  • e9efc07b74 token-import: reset yubikey Vincent Breitmoser 2017-09-05 03:18:37 +02:00
  • bc3031c9eb token-import: load from file Vincent Breitmoser 2017-09-05 02:23:53 +02:00
  • af7d36c038 token-import: first iteration Vincent Breitmoser 2017-09-04 23:54:56 +02:00
  • 21bc6f12f0 fix bugs introduced by using byte[] instead of String for fingerprints Vincent Breitmoser 2017-09-08 14:50:10 +02:00
  • 4a4e325bca encrypt to signing key in openkeychain ui Vincent Breitmoser 2017-09-06 22:07:47 +02:00
  • 93caae1342 Pull from transifex Dominik Schürmann 2017-08-29 21:13:21 +02:00
  • d6ad4cb72b Version 4.6 Dominik Schürmann 2017-08-29 21:09:09 +02:00
  • 5dd9700b74 fix drawer position glitch Vincent Breitmoser 2017-08-29 21:07:08 +02:00
  • f779c397b1 Changelog 4.6 Dominik Schürmann 2017-08-29 21:03:44 +02:00
  • 0437eb8f1d change text color again in transfer fragment Vincent Breitmoser 2017-08-29 20:40:17 +02:00
  • 6161d99ca1 Merge pull request #2117 from open-keychain/tls-psk-transfer Dominik Schürmann 2017-08-29 20:38:58 +02:00
  • e3b1cf7209 slight changes to ui Vincent Breitmoser 2017-08-29 20:34:39 +02:00
  • 5122c20e3d tls-psk: remove hostname from status message Vincent Breitmoser 2017-07-02 13:07:24 +02:00
  • c6c1222eed tls-psk: add link from secret key view Vincent Breitmoser 2017-06-29 00:13:02 +02:00
  • 33313824ce tls-psk: rename to Secure Wifi Transfer Vincent Breitmoser 2017-06-29 00:10:19 +02:00
  • ba5a1a1969 tls-psk: add specialized error screen if on bad wifi Vincent Breitmoser 2017-06-28 23:59:29 +02:00
  • 9a37fabb45 tls-psk: switch layouts in animator by id Vincent Breitmoser 2017-06-28 23:36:51 +02:00
  • f76a0f47b5 tls-psk: fix scan from proxy activity, and use Constants.SKT_SCHEME everywhere Vincent Breitmoser 2017-06-20 19:28:29 +02:00
  • 4f5f5219bd tls-psk: include wifi ssid in qr code (if available) Vincent Breitmoser 2017-06-17 00:39:27 +02:00
  • b92778f6e9 tls-psk: extract skt uri handling, and use new qr code format Vincent Breitmoser 2017-06-17 00:23:23 +02:00
  • e5189e0c39 tls-psk: fix bug with zero size layout Vincent Breitmoser 2017-06-13 11:00:47 +02:00
  • 23b1f6d7e5 tls-psk: add "more info" button Vincent Breitmoser 2017-06-13 02:22:00 +02:00
  • 0aa878d1a9 tls-psk: move descriptive text, fix typo Vincent Breitmoser 2017-06-13 02:21:42 +02:00
  • 39be6b166d tls-psk: show warning dialog before actually sending a key Vincent Breitmoser 2017-06-13 01:53:58 +02:00
  • b6586c6620 tls-psk: show a "done" button after connection is established Vincent Breitmoser 2017-06-13 01:00:55 +02:00
  • c04e716a27 tls-psk: add secure device setup to first time dialog Vincent Breitmoser 2017-06-13 01:00:33 +02:00
  • b58e30914c tls-psk: stub for tests Vincent Breitmoser 2017-06-13 00:04:19 +02:00
  • dc350cff50 tls-psk: properly set timeout while connecting Vincent Breitmoser 2017-06-12 21:21:39 +02:00
  • 34a466622e tls-psk: show "Connecting…" view while waiting Vincent Breitmoser 2017-06-12 21:08:52 +02:00
  • ca43544a0e tls-psk: handle scan from ImportKeysProxyActivity Vincent Breitmoser 2017-06-12 20:44:12 +02:00
  • af1d028520 tls-psk: show error message for unspecialized io exception Vincent Breitmoser 2017-06-12 16:28:22 +02:00
  • fa3a82ded2 tls-psk: reformat getIPAddress method Vincent Breitmoser 2017-06-12 13:17:55 +02:00
  • e470072210 tls-psk: move more magic values into constants Vincent Breitmoser 2017-06-12 13:08:26 +02:00
  • db3210e67c tls-psk: use ascii armor block delimiter Vincent Breitmoser 2017-06-12 12:56:58 +02:00
  • e2c3f5b6f8 tls-psk: show animated connection status view Vincent Breitmoser 2017-06-09 00:08:31 +02:00
  • 049b93ff03 tls-psk: display a note if there are no keys to send Vincent Breitmoser 2017-06-08 17:46:59 +02:00
  • 5cff30e7ba tls-psk: ignore incoming data if we already sent a key Vincent Breitmoser 2017-06-08 10:11:46 +02:00
  • b95e42f693 tls-psk: handle disconnect by local decision Vincent Breitmoser 2017-06-02 20:00:09 +02:00
  • 4846ee5328 tls-psk: put QR code in card Vincent Breitmoser 2017-06-02 19:15:14 +02:00
  • 3a728b94a6 tls-psk: use automatically assigned port Vincent Breitmoser 2017-06-02 12:23:40 +02:00
  • 8a345d0c72 tls-psk: use hex encoding for psk instead of base64 Vincent Breitmoser 2017-06-01 16:17:24 +02:00
  • c494c3f70f tls-psk: return identity hint as client identity Vincent Breitmoser 2017-05-31 22:04:41 +02:00
  • 41fdbd65ec tls-psk: improve error handling Vincent Breitmoser 2017-05-31 00:45:51 +02:00
  • e5931637dc tls-psk: only enable TLS_DHE_PSK_* and TLS_ECDHE_PSK_* cipher suites Vincent Breitmoser 2017-05-31 00:20:13 +02:00
  • f35a707d82 tls-psk: add compatibility fragment for android < 5 Vincent Breitmoser 2017-05-30 23:41:48 +02:00
  • 99441660ca tls-psk: some cleanup Vincent Breitmoser 2017-05-30 23:21:08 +02:00
  • a919bb3a9e tls-psk: fade between drawer fragments Vincent Breitmoser 2017-05-30 23:03:31 +02:00
  • 3ca3baf780 tls-psk: fix drawer icon and text Vincent Breitmoser 2017-05-30 23:01:10 +02:00
  • 7df2619232 tls-psk: improve error handling on connection error Vincent Breitmoser 2017-05-30 22:54:09 +02:00
  • a441df2bd7 tls-psk: display warning if not connected to wifi before connecting Vincent Breitmoser 2017-05-30 22:37:53 +02:00
  • 13873e934f tls-psk: clear all data on connection reset Vincent Breitmoser 2017-05-30 21:34:53 +02:00
  • f4d9d0a7c0 tls-psk: handle back button Vincent Breitmoser 2017-05-30 21:33:55 +02:00
  • b14674749b tls-psk: handle disconnect in ui Vincent Breitmoser 2017-05-30 19:33:37 +02:00
  • 703603782f tls-psk: actual import of keys Vincent Breitmoser 2017-05-30 19:06:28 +02:00
  • e44d668e27 tls-psk: display list of incoming keys on receiving side Vincent Breitmoser 2017-05-30 18:05:50 +02:00
  • fd34740c1a tls-psk: allow passing more than one key Vincent Breitmoser 2017-05-30 17:11:27 +02:00
  • 9b20c97e01 tls-psk: use inline progress animation Vincent Breitmoser 2017-05-30 16:26:05 +02:00
  • 0c3a247d9e tls-psk: working version, with fake progress too! Vincent Breitmoser 2017-05-30 14:39:31 +02:00
  • 747feaa100 tls-psk: use unified KeyTransferInteractor, display list of keys Vincent Breitmoser 2017-05-30 13:34:03 +02:00
  • 9b3dd27ffd tls-psk: second steps Vincent Breitmoser 2017-05-29 23:56:30 +02:00
  • a55445f5bb tls-psk: first steps Vincent Breitmoser 2017-05-29 23:12:54 +02:00
  • 6e8a768011 close database when cursor is closed for external provider Vincent Breitmoser 2017-08-29 19:38:25 +02:00
  • b450909300 don't close db in ContentProvider Vincent Breitmoser 2017-08-29 19:28:08 +02:00
  • d3746b89e5 respect most recent sig with actual key flags, if available Vincent Breitmoser 2017-08-29 01:46:08 +02:00
  • 049d665324 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2017-08-29 00:42:00 +02:00
  • fece9332db Insert classloader magic to prevent ClassNotFoundException in CryptoInputParcelCacheService Dominik Schürmann 2017-08-29 00:41:41 +02:00
  • b7968d6279 don't encrypt twice to the same key if additional encryption id is in recipient list Vincent Breitmoser 2017-08-28 17:36:19 +02:00
  • ef59affd74 Version 4.5.1 Dominik Schürmann 2017-08-28 17:19:06 +02:00
  • 7a19515d67 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2017-08-28 17:15:09 +02:00
  • b9c5a4ea2c Update PayPal email Dominik Schürmann 2017-08-28 17:15:03 +02:00
  • 5c4e227b89 update openpgp api lib Vincent Breitmoser 2017-08-28 17:14:46 +02:00
  • c418f7d899 Pull from Transifex Dominik Schürmann 2017-08-28 17:12:11 +02:00
  • 7070678d2e small improvement for app registration screen Vincent Breitmoser 2017-08-25 16:17:20 +02:00
  • 4671cefaa1 pass key confirmation status through for autocrypt status query Vincent Breitmoser 2017-08-24 16:08:42 +02:00
  • 6d99abf5eb make database upgrade path more reliable Vincent Breitmoser 2017-08-04 13:08:39 +02:00
  • 010e612f85 fix trivial NPE (fixes #2142) Vincent Breitmoser 2017-08-04 11:55:05 +02:00
  • 7a9673fe47 Merge pull request #2145 from open-keychain/ditch-android-beam Dominik Schürmann 2017-08-02 23:45:36 +02:00
  • b94a8c9dee remove nfc key transfer feature, this was broken anyways Vincent Breitmoser 2017-08-02 22:13:05 +02:00
  • 4e920afe94 rewrite NfcHelper Vincent Breitmoser 2017-08-02 21:39:36 +02:00
  • dd5d57d06c Merge pull request #2143 from nekosune/patch-1 Dominik Schürmann 2017-07-28 16:54:39 +02:00
  • d95e98b2ed Fix #2080 Katrina Swales 2017-07-28 04:15:01 +01:00
  • f576b644ef Version 4.5 Dominik Schürmann 2017-07-26 12:26:07 +02:00
  • 5c0baefd43 Pull from transifex Dominik Schürmann 2017-07-26 12:22:18 +02:00
  • 8d3d03a066 Changelog for 4.5 Dominik Schürmann 2017-07-26 12:05:08 +02:00
  • 93d7b3bdf3 pass through data correctly in new remote activities Vincent Breitmoser 2017-07-26 00:46:08 +02:00
  • 553682582c fix migration Vincent Breitmoser 2017-07-25 23:19:02 +02:00
  • f453c107e7 Display URL in keyserver prefs Dominik Schürmann 2017-07-25 23:18:28 +02:00
  • 7d6fcf750d Merge pull request #2127 from open-keychain/autocrypt Dominik Schürmann 2017-07-25 22:58:59 +02:00
  • dfa4375697 fix and add some more tests for external provider Vincent Breitmoser 2017-06-28 22:23:30 +02:00
  • 5da3ae7e62 update openpgp-api lib Vincent Breitmoser 2017-06-28 21:34:30 +02:00
  • d331d16e56 fix content observer notification in IdentityLoader Vincent Breitmoser 2017-06-28 14:41:24 +02:00
  • 226182e51c add context menu to autocrypt identity items Vincent Breitmoser 2017-06-28 14:41:03 +02:00