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

5697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
c8b112c70d Update openpgp-api-lib 2016-05-07 12:20:54 +03: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
Dominik Schürmann
d4612b5e17 Merge pull request #1855 from AlexFJW/ImportKeyFix 
Fixes bug for #1854
 2016-05-07 11:45:22 +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
Vincent Breitmoser
5e9de4447c external-provider: only allow permission check for caller package names 2016-05-06 12:54:35 +02:00
Dominik Schürmann
6f35a5565a Version 3.9.6 beta 2016-05-05 14:41:46 +03:00
Dominik Schürmann
da92e5f376 Merge branch 'AlexFJW-StrippedChangePass' 2016-05-05 14:37:09 +03: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
a5a2335673 Added license to ChangeUnlockOperation 2016-05-05 07:57:20 +08:00
Alex Fong
01c2e1429b Edited comments 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
dfcde9242d Removed unrequired code, standardized terms used. 2016-05-05 07:57:01 +08:00
Alex Fong
b490be9c1c Refactored code to use functions already present in code, reduced liberties taken when modifying functions. 
Todo:
Fix indentation for error messages
 2016-05-05 07:56:26 +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
Vincent Breitmoser
6b7a0597af api: add a comment explaining use of wrapperBundle 2016-05-04 11:45:56 +02:00
Vincent Breitmoser
4c063ebe46 api: ACTION_GET_KEY selects by any subkey, rather than just master key id 2016-05-04 11:36:55 +02:00
Dominik Schürmann
20194107e6 Merge pull request #1850 from nmikhailov/master 
Fix rotation crash in CreateSecurityTokenWaitFragment #1849
 2016-05-01 18:18:55 +02: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
562d0016be Improve security_token_error_iso_dep_not_supported 2016-04-30 14:46:51 +02:00
Dominik Schürmann
18ce7539f7 Fix german title from transifex 2016-04-30 14:44:35 +02:00
Dominik Schürmann
5805cd4d0a Fix createUserId 2016-04-29 23:52:01 +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
6a8a10336b Merge branch 'LuboViluda-master' 2016-04-29 23:14:33 +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
fad63cc76f Use StringBuilder.append() according to lint 2016-04-29 22:37:52 +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
8e6326faf7 Merge branch '007durgesh219-Issue#925' 2016-04-29 21:51: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
0ef59e36ad Merge pull request #1816 from fiaxh/no_name_choose_email 
Correctly handle keys only having an email address
 2016-04-29 21:40:00 +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
32f16ee7c3 Fix travis 2016-04-29 21:17:08 +02:00
Dominik Schürmann
9930d67521 Update more libraries 2016-04-29 21:09:20 +02:00
Dominik Schürmann
8e0324dbd8 Update build config, gitignore after testing 2016-04-29 17:27:28 +02:00
Dominik Schürmann
111ca4435e Update build tools for travis 2016-04-29 17:06:00 +02:00
Dominik Schürmann
ab7f6fa992 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-04-29 17:03:57 +02:00
Dominik Schürmann
19e6103e5f Update libraries, add proguard filters to be under 64K limit 2016-04-29 17:03:50 +02:00
Vincent Breitmoser
8e4d68c55a api: allow caching of sessionKey in OpenPgpDecryptResult 2016-04-29 15:46:17 +02:00
Dominik Schürmann
5fdc312b2d Version 3.9.5 2016-04-29 13:16:32 +02:00
Dominik Schürmann
af15e87477 New translations from transifex 2016-04-29 12:49:54 +02:00