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

Commit graph

  • 4278aa1bf1 Revert "Added warning dialog for importing keys" Dominik Schürmann 2016-05-05 14:29:56 +03:00
  • 6cf3e4c891 Slight amendments for clarity Alex Fong 2016-05-05 07:40:08 +08:00
  • bc3aa44b22 Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel Alex Fong 2016-04-19 09:00:15 +08:00
  • a5a2335673 Added license to ChangeUnlockOperation Alex Fong 2016-04-17 18:25:15 +08:00
  • 01c2e1429b Edited comments Alex Fong 2016-04-17 18:07:23 +08:00
  • 89cf3bb6d9 Fixed warnings encountered Alex Fong 2016-04-17 14:11:26 +08:00
  • 9d35dcb0e9 Added warning dialog for importing keys Alex Fong 2016-04-17 13:33:41 +08:00
  • f43edcdd7a Refactoring: Removed PassphraseChangeParcel and placed its functionality into ChangeUnlockParcel. Alex Fong 2016-04-17 11:34:08 +08:00
  • dfcde9242d Removed unrequired code, standardized terms used. Alex Fong 2016-03-17 08:03:22 +08:00
  • b490be9c1c Refactored code to use functions already present in code, reduced liberties taken when modifying functions. Alex Fong 2016-03-15 20:59:42 +08:00
  • 525788359c (WIP) Change password when key is stripped #1692 Alex Fong 2016-03-15 10:24:28 +08:00
  • 6b7a0597af api: add a comment explaining use of wrapperBundle Vincent Breitmoser 2016-05-04 11:45:56 +02:00
  • 4c063ebe46 api: ACTION_GET_KEY selects by any subkey, rather than just master key id Vincent Breitmoser 2016-05-04 11:36:55 +02:00
  • 20194107e6 Merge pull request #1850 from nmikhailov/master Dominik Schürmann 2016-05-01 18:18:55 +02:00
  • 0faab067c6 Fix rotation crash in CreateSecurityTokenWaitFragment Nikita Mikhailov 2016-05-01 22:16:52 +06:00
  • b97971a29c Fix error codes for ykneo-openpgp 1.0.11 Dominik Schürmann 2016-04-30 16:46:22 +02:00
  • 1cc0fe558b Remove lefover comment Dominik Schürmann 2016-04-30 15:35:20 +02:00
  • d72001c690 Fix animation in manage keys for security tokens Dominik Schürmann 2016-04-30 15:24:09 +02:00
  • 562d0016be Improve security_token_error_iso_dep_not_supported Dominik Schürmann 2016-04-30 14:46:51 +02:00
  • 18ce7539f7 Fix german title from transifex Dominik Schürmann 2016-04-30 14:44:35 +02:00
  • 5805cd4d0a Fix createUserId Dominik Schürmann 2016-04-29 23:52:01 +02:00
  • adeb1bd3f8 Merge pull request #1819 from 007durgesh219/Issue#1817 Dominik Schürmann 2016-04-29 23:19:15 +02:00
  • 6a8a10336b Merge branch 'LuboViluda-master' Dominik Schürmann 2016-04-29 23:14:33 +02:00
  • b4af7a06a5 Use proper ImportKeysProxyActivity to scan QR Codes Dominik Schürmann 2016-04-29 23:14:24 +02:00
  • 67607933ad Merge branch 'master' of https://github.com/LuboViluda/open-keychain into LuboViluda-master Dominik Schürmann 2016-04-29 23:03:13 +02:00
  • fad63cc76f Use StringBuilder.append() according to lint Dominik Schürmann 2016-04-29 22:37:52 +02:00
  • 7b24679094 Re-enable move-to-card option, improve strings Dominik Schürmann 2016-04-29 22:22:10 +02:00
  • 8e6326faf7 Merge branch '007durgesh219-Issue#925' Dominik Schürmann 2016-04-29 21:51:10 +02:00
  • a242881da6 Include only add button in dropdown width Dominik Schürmann 2016-04-29 21:50:54 +02:00
  • 3cc92e6f61 Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain into 007durgesh219-Issue#925 Dominik Schürmann 2016-04-29 21:41:46 +02:00
  • 0ef59e36ad Merge pull request #1816 from fiaxh/no_name_choose_email Dominik Schürmann 2016-04-29 21:40:00 +02:00
  • 0e67b49e1a Merge pull request #1831 from fiaxh/key_creation_flexible Dominik Schürmann 2016-04-29 21:36:53 +02:00
  • 120f71d791 Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt Dominik Schürmann 2016-04-29 21:24:15 +02:00
  • 32f16ee7c3 Fix travis Dominik Schürmann 2016-04-29 21:17:08 +02:00
  • 9930d67521 Update more libraries Dominik Schürmann 2016-04-29 21:09:20 +02:00
  • 8e0324dbd8 Update build config, gitignore after testing Dominik Schürmann 2016-04-29 17:27:28 +02:00
  • 111ca4435e Update build tools for travis Dominik Schürmann 2016-04-29 17:06:00 +02:00
  • ab7f6fa992 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2016-04-29 17:03:57 +02:00
  • 19e6103e5f Update libraries, add proguard filters to be under 64K limit Dominik Schürmann 2016-04-29 17:03:50 +02:00
  • 8e4d68c55a api: allow caching of sessionKey in OpenPgpDecryptResult Vincent Breitmoser 2016-04-29 15:40:35 +02:00
  • 5fdc312b2d Version 3.9.5 Dominik Schürmann 2016-04-29 13:16:32 +02:00
  • af15e87477 New translations from transifex Dominik Schürmann 2016-04-29 12:49:54 +02:00
  • afeaf5c457 Fix strings Dominik Schürmann 2016-04-18 07:39:02 +02:00
  • ed82c362e6 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2016-04-18 07:31:38 +02:00
  • 15ed1c9a63 Fix delete_fail Dominik Schürmann 2016-04-18 07:31:31 +02:00
  • b9df34468b Merge pull request #1835 from nmikhailov/check_security_token Dominik Schürmann 2016-04-16 11:50:23 +02:00
  • 935f88131e Check subkey id instead of masterkey id on security token operations Nikita Mikhailov 2016-04-16 15:45:43 +06:00
  • a87c65c3f4 Check if security token keys match required once before signing/decryption Nikita Mikhailov 2016-04-16 01:43:13 +06:00
  • 163aef4c6b Update obsolete Nfc class prefixes Nikita Mikhailov 2016-04-16 00:15:04 +06:00
  • f1b14d338c Fix string Dominik Schürmann 2016-04-16 00:51:31 +02:00
  • 6126e3d9ae Merge pull request #1824 from nmikhailov/otg2 Dominik Schürmann 2016-04-15 18:19:32 +02:00
  • 38adb9c40e Fix Wrong file encrypted from cached input Durgesh 2016-04-15 15:40:29 +05:30
  • 249b8d7d78 Handle user input on key creation more generously Allow empty name and do not regex-check email fixes #1825 fiaxh 2016-04-15 01:21:15 +02:00
  • 28a352a288 OTG: Rename smartcard -> security token Nikita Mikhailov 2016-04-15 02:02:11 +06:00
  • db57cf3e7e OTG: Skip TokenWaitFragmen when otg device is connected Nikita Mikhailov 2016-04-15 00:37:55 +06:00
  • 263799ec96 OTG: Fix connection issues Nikita Mikhailov 2016-04-15 00:13:33 +06:00
  • 784bf2322c OTG: Replace colons with dashes in usb error messages Nikita Mikhailov 2016-04-12 00:06:21 +06:00
  • df57ecde47 OTG: rename Smartcard -> SecurityToken Nikita Mikhailov 2016-04-12 00:02:59 +06:00
  • 4e543e5368 OTG: rescan devices before next operation Nikita Mikhailov 2016-04-10 23:44:52 +06:00
  • 8cb94c446b OTG: Add copyright Nikita Mikhailov 2016-04-10 23:08:52 +06:00
  • 7caceee92f OTG: fix icc powering method Nikita Mikhailov 2016-04-10 22:29:45 +06:00
  • 0077f3a3b8 OTG: Add/Update copyrights Nikita Mikhailov 2016-04-09 18:35:32 +06:00
  • 0c9ead62a0 OTG: Remove obsolete Pin classes, reenable changeKey method Nikita Mikhailov 2016-04-09 18:24:31 +06:00
  • b37b171908 OTG: move UsbConnectionDispatcher to utls package Nikita Mikhailov 2016-04-09 17:45:17 +06:00
  • 409c38ba2a OTG: UsbTransport minor refactoring Nikita Mikhailov 2016-04-09 17:28:44 +06:00
  • 6ad2676e8c OTG: Add/update javadoc; rename methods, exceptions Nikita Mikhailov 2016-04-09 16:03:31 +06:00
  • 38a1c2d3ab OTG: refactor, change nfc prefix to smartcard Nikita Mikhailov 2016-04-09 13:23:29 +06:00
  • 4d9ce8e95b OTG: Refactor persistent connections, naming Nikita Mikhailov 2016-04-09 13:13:02 +06:00
  • b5eb6468fe OTG: Add support for persistent usb connection Nikita Mikhailov 2016-04-08 00:41:53 +06:00
  • 3798249570 OTG: Implement hidden activity usb detection technique Nikita Mikhailov 2016-04-07 01:22:24 +06:00
  • 5e18b15775 OTG: Rename 'javacard' package, methods, remove JavacardInterface Nikita Mikhailov 2016-04-06 22:49:52 +06:00
  • 79a0918072 OTG: Fix usb transport Nikita Mikhailov 2016-04-06 01:33:01 +06:00
  • 3d538d885e OTG: Usb device manager fixes Nikita Mikhailov 2016-04-04 01:31:14 +06:00
  • bd2906a887 OTG: Add usb device manager prototype Nikita Mikhailov 2016-04-04 00:33:59 +06:00
  • 834440199a OTG: update methods Nikita Mikhailov 2016-04-03 22:20:33 +06:00
  • 65f17d7449 OTG: port old primitives from otg_alt branch Nikita Mikhailov 2016-04-03 19:54:24 +06:00
  • 8f88efe13f Fix Crash when no encryption subkey is available, Issue #1817 Durgesh 2016-04-05 04:01:24 +05:30
  • 72d2a627ff Add + button besides TokenAutoComplete, Issue #925 Durgesh 2016-04-05 23:22:13 +05:30
  • e08ae31797 Remove old keybase path Dominik Schürmann 2016-04-13 18:57:21 +02:00
  • a16c4bcc30 Version 3.95 beta Dominik Schürmann 2016-04-13 17:12:48 +02:00
  • ab323bddab Fix string Dominik Schürmann 2016-04-13 17:00:24 +02:00
  • 8bcd4003a9 KeybaseLib workaround Dominik Schürmann 2016-04-12 19:42:54 +02:00
  • 4ac63de83b Fix wrapper URL Dominik Schürmann 2016-04-12 19:33:10 +02:00
  • 115c46d015 Update Android Gradle Plugin to 2.0 with workarounds Dominik Schürmann 2016-04-12 19:28:00 +02:00
  • 060a5a1815 Merge branch 'backup-code' Dominik Schürmann 2016-04-12 19:08:32 +02:00
  • ef355aa001 Fix in-app help for backup codes Dominik Schürmann 2016-04-12 19:08:20 +02:00
  • f7654af00b Revert usage of masked-edittext, back to plain edittexts for backup codes Dominik Schürmann 2016-04-12 19:06:08 +02:00
  • 8933263665 unnecesary code removed Lubo Viluda 2016-04-12 16:43:06 +02:00
  • ff9226c25c Fix strings Dominik Schürmann 2016-04-12 16:15:07 +02:00
  • a7a0d9dd4b Unnecesary code removed and string repaired Lubo Viluda 2016-04-12 15:41:42 +02:00
  • 6881754062 Better handle user_id sidecases while splitting fiaxh 2016-04-04 17:40:31 +02:00
  • 2d73b74dde Use email field to match email in KeychainProvider fixes #1699 fiaxh 2016-04-04 17:42:21 +02:00
  • b55c505054 Merge pull request #1772 from runnerway/importkey-encrypted Vincent 2016-04-12 10:13:30 +02:00
  • 8efef3d248 Merge pull request #1828 from nmikhailov/holder_text_fix Dominik Schürmann 2016-04-12 09:25:34 +02:00
  • 8476999922 Add missing keyholder string param Nikita Mikhailov 2016-04-11 00:02:05 +06:00
  • d3a34adb28 Merge branch 'kepuss-okhttp3' Dominik Schürmann 2016-04-09 18:34:12 +02:00
  • c8e5395d4e Use cert pinning only if available Dominik Schürmann 2016-04-09 18:34:00 +02:00
  • 2d762e55da Okhttp3 cleanups, docs, and fix timeouts for default client Dominik Schürmann 2016-04-09 11:53:37 +02:00
  • 4edb805ba1 Update keybase submodule Dominik Schürmann 2016-04-09 11:45:09 +02:00
  • 7b97c2bbed KeyBaseLib response Client Michal Kepkowski 2016-04-08 19:10:59 +02:00