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

1899 Commits

Author SHA1 Message Date
Alex Fong
774c806f46 Added passphrase check for stripped masterkeys 2016-05-19 13:08:10 +08:00
Vincent Breitmoser
1da8e4c1ed make unencrypted backup an explicit parameter 2016-05-17 20:59:07 +02:00
Vincent
60c277b96f Merge pull request #1870 from AlexFJW/RemovedDuplicateCode 
Shifted duplicate method implementations from KeyRing to openpgp-api …
 2016-05-17 20:31:40 +02:00
Andrea Torlaschi
2ab55b6767 Settings: remove unuseful initialization 2016-05-17 17:09:03 +02:00
Andrea Torlaschi
a2d2da9098 Settings: change CheckBoxPreference to SwitchPreference 2016-05-17 16:51:44 +02:00
Alex Fong
614f46a630 Shifted duplicate method implementations from KeyRing to openpgp-api submodule 2016-05-15 23:26:09 +08:00
Dominik Schürmann
f44bd23622 Revert "Add + button besides TokenAutoComplete, Issue #925" 
This reverts commit 72d2a627ff.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
 2016-05-12 14:53:16 +03:00
Vincent Breitmoser
48758cdec5 update progress handling in PgpDecryptVerifyOperation 
- less progress messages overall
- report progress again based on input stream position, if filesize is known
- limit progress messages to one every 200ms while decrypting
- also fixed a bug in DecryptListFragment, the recycler view now reuses
  old views as intended instead of crossfading all the time.
 2016-05-11 16:17:01 +02:00
Andrea Torlaschi
c942d8b2ff PgpSignEncryptOperation refactoring 2016-05-10 23:38:11 +02:00
Dominik Schürmann
7dd5e22353 Merge branch 'master' into backup-api 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	extern/openpgp-api-lib
 2016-05-07 12:01:16 +03:00
Alex Fong
2f33fe3118 A simple fix to clear the list of detected keys when parsing key file gives an error. 2016-05-07 08:44:59 +08:00
Dominik Schürmann
eeb6fa5755 Fix formatting 2016-05-05 14:35:08 +03:00
Dominik Schürmann
4278aa1bf1 Revert "Added warning dialog for importing keys" 
This reverts commit 9d35dcb0e9.

Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
 2016-05-05 14:29:56 +03:00
Alex Fong
6cf3e4c891 Slight amendments for clarity 2016-05-05 07:57:20 +08:00
Alex Fong
bc3aa44b22 Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel 2016-05-05 07:57:20 +08:00
Alex Fong
89cf3bb6d9 Fixed warnings encountered 2016-05-05 07:57:20 +08:00
Alex Fong
9d35dcb0e9 Added warning dialog for importing keys 2016-05-05 07:57:20 +08:00
Alex Fong
f43edcdd7a Refactoring: Removed PassphraseChangeParcel and placed its functionality into ChangeUnlockParcel. 2016-05-05 07:57:20 +08:00
Alex Fong
525788359c (WIP) Change password when key is stripped #1692 
Approach:
Find the first unstripped secret key and use it for passphrase verification
All unstripped keys will have their passphrase changed to new passphrase, if possible.

Current Progress:
Changing the passphrase of keys works fine.
Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword"
may be possible if given the go-ahead.
 2016-05-04 22:36:23 +08:00
Nikita Mikhailov
0faab067c6 Fix rotation crash in CreateSecurityTokenWaitFragment 2016-05-01 22:16:52 +06:00
Dominik Schürmann
b97971a29c Fix error codes for ykneo-openpgp 1.0.11 2016-04-30 16:46:22 +02:00
Dominik Schürmann
1cc0fe558b Remove lefover comment 2016-04-30 15:35:20 +02:00
Dominik Schürmann
d72001c690 Fix animation in manage keys for security tokens 2016-04-30 15:24:09 +02:00
Dominik Schürmann
adeb1bd3f8 Merge pull request #1819 from 007durgesh219/Issue#1817 
Fix Crash when no encryption subkey is available, Issue #1817
 2016-04-29 23:19:15 +02:00
Dominik Schürmann
b4af7a06a5 Use proper ImportKeysProxyActivity to scan QR Codes 2016-04-29 23:14:24 +02:00
Dominik Schürmann
67607933ad Merge branch 'master' of https://github.com/LuboViluda/open-keychain into LuboViluda-master 2016-04-29 23:03:13 +02:00
Dominik Schürmann
7b24679094 Re-enable move-to-card option, improve strings 2016-04-29 22:22:10 +02:00
Dominik Schürmann
a242881da6 Include only add button in dropdown width 2016-04-29 21:50:54 +02:00
Dominik Schürmann
3cc92e6f61 Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain into 007durgesh219-Issue#925 2016-04-29 21:41:46 +02:00
Dominik Schürmann
0e67b49e1a Merge pull request #1831 from fiaxh/key_creation_flexible 
Handle user input on key creation more generously
 2016-04-29 21:36:53 +02:00
Dominik Schürmann
120f71d791 Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt 
Fix Wrong file encrypted from cached input
 2016-04-29 21:24:15 +02:00
Dominik Schürmann
19e6103e5f Update libraries, add proguard filters to be under 64K limit 2016-04-29 17:03:50 +02:00
Nikita Mikhailov
935f88131e Check subkey id instead of masterkey id on security token operations 
Rename ambiguous getMasterKeyFingerprint -> getKeyFingerprint
 2016-04-16 15:45:43 +06:00
Nikita Mikhailov
a87c65c3f4 Check if security token keys match required once before signing/decryption 2016-04-16 11:13:57 +06:00
Nikita Mikhailov
163aef4c6b Update obsolete Nfc class prefixes 2016-04-16 11:13:51 +06:00
Durgesh
38adb9c40e Fix Wrong file encrypted from cached input 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-04-15 15:40:29 +05:30
fiaxh
249b8d7d78 Handle user input on key creation more generously 
Allow empty name and do not regex-check email
fixes #1825
 2016-04-15 01:21:15 +02:00
Nikita Mikhailov
28a352a288 OTG: Rename smartcard -> security token 2016-04-15 02:02:11 +06:00
Nikita Mikhailov
db57cf3e7e OTG: Skip TokenWaitFragmen when otg device is connected 2016-04-15 01:54:17 +06:00
Nikita Mikhailov
263799ec96 OTG: Fix connection issues 2016-04-15 01:54:09 +06:00
Nikita Mikhailov
df57ecde47 OTG: rename Smartcard -> SecurityToken 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
4e543e5368 OTG: rescan devices before next operation 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
8cb94c446b OTG: Add copyright 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
0077f3a3b8 OTG: Add/Update copyrights 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
0c9ead62a0 OTG: Remove obsolete Pin classes, reenable changeKey method 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
b37b171908 OTG: move UsbConnectionDispatcher to utls package 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
6ad2676e8c OTG: Add/update javadoc; rename methods, exceptions 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
38a1c2d3ab OTG: refactor, change nfc prefix to smartcard 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
4d9ce8e95b OTG: Refactor persistent connections, naming 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
b5eb6468fe OTG: Add support for persistent usb connection 
No need to reinsert token on each operation
 2016-04-14 22:48:01 +06:00