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

5549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Breitmoser
ce5e5f36c5 update null-check for duplicates, and add matching indexes to name and email columns 2016-03-16 00:49:19 +01:00
Dominik Schürmann
f3712101c1 Version 3.9.4 2016-03-15 23:53:03 +01:00
Vincent Breitmoser
6029564d68 small update to duplicate detection 2016-03-15 23:51:21 +01:00
Vincent
5abbe859ff Merge pull request #1777 from fjodorver/master 
Updated HAS_DUPLICATE_USER_ID in KeychainProvider #1745
 2016-03-15 23:40:09 +01:00
Vincent Breitmoser
eb5eb95a9f fix ridiculous database migration bug introduced by d6e4936fa5 2016-03-15 23:30:50 +01:00
Dominik Schürmann
2b43ba438b Version 3.9.3 2016-03-15 18:01:27 +01:00
Dominik Schürmann
faae8bc3d9 Merge pull request #1780 from AlexFJW/backup-code-selection 
Provisional backup-code text selection fix
 2016-03-12 11:25:46 +01:00
Alex Fong
b5211b33de Provisional backup-code text selection fix 
For issue #1779, a provisional fix where selection is still possible, but more difficult.
Preventing selection altogether is not possible due to the implementation in the Masked-Edittext dependency.

To be updated when Masked-Edittext fixes this bug.
 2016-03-12 12:46:20 +08:00
fjodor
6087b0a6e0 Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email address instead of user id #1745 2016-03-10 21:26:55 +02:00
Vincent
81e46a7bc3 Merge pull request #1763 from fjodorver/master 
WIP: Save split user ids in database #1745
 2016-03-10 19:43:05 +01:00
Vincent Breitmoser
69e6e404bf service: add opportunistic mode to encryption 2016-03-10 18:34:39 +01:00
Dominik Schürmann
48867e89bd Update okhttp2, tokenautomcomplete, zxing 2016-03-10 12:25:13 +01:00
Dominik Schürmann
9f15e7494b Merge pull request #1774 from fiaxh/keyserver_select_dark 
Fix display of keyserver item in dark theme in SettingsKeyserverActivity
 2016-03-10 03:04:36 +01:00
fiaxh
4d347f1a8e Fix display of keyserver item in dark theme 2016-03-10 01:42:39 +01:00
Dominik Schürmann
bd2c41df22 Merge pull request #1769 from 007durgesh219/Issue#1766 
Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermission, #1766
 2016-03-08 17:23:12 +01:00
Durgesh
4a33cc8317 Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermission, #1766 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-08 21:14:50 +05:30
Dominik Schürmann
305fee5ea1 Open keyboard for backup code 2016-03-08 16:20:48 +01:00
Dominik Schürmann
7882f16331 Make it a style to reduce code duplication 2016-03-08 16:10:06 +01:00
Dominik Schürmann
456535729c Add more responsive text sizes 2016-03-08 15:57:48 +01:00
Dominik Schürmann
e8875adaa4 Using new size qualifiers 2016-03-08 15:47:32 +01:00
Dominik Schürmann
5379f64d08 Revert "Use non-breaking spaces for backup code MaskedEditText" 
This reverts commit 0feb4d074c.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
 2016-03-08 15:01:49 +01:00
Dominik Schürmann
d6520cde04 Fix code style and documentation in BaseSecurityTokenNfcActivity 2016-03-08 04:04:18 +01:00
Dominik Schürmann
84fb5e45b1 Fix documentation of nfcGenerateOnCardKey 2016-03-08 03:01:32 +01:00
Dominik Schürmann
e45d671ce9 Fix comment in nfcGenerateOnCardKey 2016-03-08 02:34:57 +01:00
Dominik Schürmann
3d1d268997 Add nfcGenerateOnCardKey by Joey Castillo before it gets lost 2016-03-08 02:27:56 +01:00
fjodor
b4ea59bf7c Increased version DB and added a migration path from an old database format 2016-03-07 16:40:26 +02:00
fjodor
1a202b028d Save split user ids in database #1745 
Save split user ids in database
 2016-03-07 07:50:39 +02:00
Dominik Schürmann
b6db814951 Merge branch 'kepuss-okHttpLinkedToken' 2016-03-07 00:40:49 +01:00
Dominik Schürmann
c419942a3f Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain into kepuss-okHttpLinkedToken 2016-03-07 00:37:35 +01:00
Dominik Schürmann
4a3cd716eb Version 3.9.2 2016-03-07 00:24:13 +01:00
Dominik Schürmann
67178ef893 fix get key ids by removing another leftover 2016-03-07 00:23:43 +01:00
Vincent Breitmoser
b8a73427bd fix bug from leftover line in openpgpservice 2016-03-07 00:12:17 +01:00
Dominik Schürmann
3f746bd281 Version 3.9.1 2016-03-06 14:14:34 +01:00
Dominik Schürmann
005aed8df1 Merge pull request #1757 from 007durgesh219/Issue#1752 
Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752
 2016-03-06 14:12:32 +01:00
Durgesh
8b8b91e247 Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-06 18:39:30 +05:30
Dominik Schürmann
6a3832659e Merge pull request #1747 from runnerway/fix-alreadyadded 
Fix duplicate file insertion while encrypting
 2016-03-06 00:56:04 +01:00
Dominik Schürmann
201c38ec02 Merge pull request #1750 from 007durgesh219/Issue#1746 
Fix Dark theme no longer works in main screen on android 5, Issue#1746
 2016-03-05 18:28:02 +01:00
Michal Kepkowski
852ccc3f8f dependency removed 2016-03-05 16:23:53 +01:00
Dominik Schürmann
82c3426c6f Merge pull request #1738 from runnerway/storage-permission-fix 
Always check read permission
 2016-03-05 16:12:13 +01:00
Dominik Schürmann
97d157a282 Merge pull request #1751 from runnerway/decrypt-filename 
Fix wrong behavior of third-party apps while opening files after decryption
 2016-03-05 15:06:43 +01:00
Andrea Torlaschi
bcef5b6692 Set filename after decryption 2016-03-05 13:24:18 +01:00
Andrea Torlaschi
26f8a9db9c Extend FileProvider to support name update 2016-03-05 13:17:15 +01:00
Durgesh
d352ccf8ae Fix Dark theme no longer works in main screen on android 5, Issue#1746 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-05 17:27:22 +05:30
Michal Kepkowski
78a30ed207 okHttp 2016-03-04 11:22:14 +01:00
Andrea Torlaschi
73bbfc54d9 Remove uri from pending even when already added 2016-03-04 09:16:09 +01:00
Dominik Schürmann
556c04db82 Merge pull request #1743 from advaita13/master 
Contact Synchronisation Notification
 2016-03-03 22:45:38 +01:00
Dominik Schürmann
1cbecb1b3b Add missing 2 EUR selection for donation 2016-03-03 15:18:31 +01:00
Dominik Schürmann
eef8abcf80 Version 3.9 2016-03-03 13:34:08 +01:00
Dominik Schürmann
7d3b903690 Transifex: pt_BR 2016-03-03 13:31:46 +01:00