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

1452 Commits

Author SHA1 Message Date
Andrea Torlaschi
dc32ff2707 Padding cleanup 2016-05-17 17:48:59 +02:00
Andrea Torlaschi
7a7d32f706 Remove dividers 
Divider shouldn't be used after last item
 2016-05-17 17:20:01 +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
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
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
9d35dcb0e9 Added warning dialog for importing keys 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
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
Dominik Schürmann
b97971a29c Fix error codes for ykneo-openpgp 1.0.11 2016-04-30 16:46:22 +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
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
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
af15e87477 New translations from transifex 2016-04-29 12:49:54 +02:00
Dominik Schürmann
afeaf5c457 Fix strings 2016-04-18 07:39:02 +02:00
Dominik Schürmann
ed82c362e6 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-04-18 07:31:38 +02:00
Dominik Schürmann
15ed1c9a63 Fix delete_fail 2016-04-18 07:31:31 +02:00
Dominik Schürmann
b9df34468b Merge pull request #1835 from nmikhailov/check_security_token 
Check security token
 2016-04-16 11:50:23 +02:00
Nikita Mikhailov
a87c65c3f4 Check if security token keys match required once before signing/decryption 2016-04-16 11:13:57 +06:00
Dominik Schürmann
f1b14d338c Fix string 2016-04-16 00:51:31 +02:00
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
3798249570 OTG: Implement hidden activity usb detection technique 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
bd2906a887 OTG: Add usb device manager prototype 2016-04-14 22:48:01 +06:00
Durgesh
8f88efe13f Fix Crash when no encryption subkey is available, Issue #1817 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-04-14 11:05:55 +05:30
Durgesh
72d2a627ff Add + button besides TokenAutoComplete, Issue #925 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-04-14 02:43:32 +05:30
Dominik Schürmann
ab323bddab Fix string 2016-04-13 17:00:24 +02:00
Dominik Schürmann
060a5a1815 Merge branch 'backup-code' 2016-04-12 19:08:32 +02:00
Dominik Schürmann
ef355aa001 Fix in-app help for backup codes 2016-04-12 19:08:20 +02:00
Dominik Schürmann
f7654af00b Revert usage of masked-edittext, back to plain edittexts for backup codes 2016-04-12 19:06:08 +02:00
Lubo Viluda
8933263665 unnecesary code removed 
- setContentView removed
- R.layout.redirect_import_keys_activity.xml removed
 2016-04-12 16:43:06 +02:00
Dominik Schürmann
ff9226c25c Fix strings 2016-04-12 16:15:07 +02:00
Lubo Viluda
a7a0d9dd4b Unnecesary code removed and string repaired 
- Unnecesary import from RedirectImportKeyActivity.java removed
- ..\value-w820dp\dimens.xml was unnecesary
- \..value\dimens.xml unnecasary line
- string sources repaired
 2016-04-12 15:41:42 +02:00
Vincent
b55c505054 Merge pull request #1772 from runnerway/importkey-encrypted 
Handle encrypted files in "import key" file selection
 2016-04-12 10:13:30 +02:00
Nikita Mikhailov
8476999922 Add missing keyholder string param 2016-04-11 00:02:05 +06:00
Vincent
88ba5688d8 Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar 
tint linked contact picture in toolbar #1298
 2016-04-06 15:33:03 +02:00
Victor Hazali
db3e90821c Used a constant instead of magic number for colour 
Explicitly stated the blending mode
 2016-04-04 18:52:22 +08:00
Vincent
77678886fc Merge pull request #1808 from vhazali/warn-when-stripping-master-key 
Warn when stripping master key #1554
 2016-04-04 11:37:50 +02:00
Vincent
e0463ec818 Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions 
Refer to issue #1600 Limit create key options
 2016-04-04 10:53:11 +02:00
Alex Fong
cb9bdb3cf7 Redesigned subkey creation dialog and changed default key type created to RSA, 3072 bit. 
Added code to prevent removal of master subkey when modifying a new key.
 2016-04-01 23:12:11 +08:00
Victor Hazali
8673777ae5 Corrected warning message 2016-04-01 10:34:27 +08:00
Durgesh
990948e3fb Fix Display Key in UploadKeyActivity, Issue #506 2016-03-31 20:52:34 +05:30
Victor Hazali
705a55a7a3 Corrected capitalisation of subkey 2016-03-30 06:09:13 +08:00
Victor Hazali
8ac7115f22 Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripping-master-key 2016-03-30 05:33:11 +08:00