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

3667 Commits

Author SHA1 Message Date
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
5411963aff Refactored switch statements to use constants 2016-03-30 06:07:59 +08:00
Victor Hazali
ce70568ff3 Extracted method 2016-03-30 05:37:31 +08:00
Victor Hazali
8ac7115f22 Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripping-master-key 2016-03-30 05:33:11 +08:00
Victor Hazali
8f4238df28 Fixes #1298 2016-03-30 04:21:33 +08:00
Durgesh
0f716f7b9f Display Key moved to Fragment 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-29 22:46:20 +05:30
Andrea Torlaschi
360b5a658a Handle encrypted files while importing keys 2016-03-27 18:20:29 +02:00
Lubo Viluda
05da8afad9 Theme change 
Theme.Keychain.Transparet is used
 2016-03-24 19:45:59 +01:00
Adithya Abraham Philip
4b6df7d17c change sync interval on change in code 2016-03-24 22:10:47 +05:30
Vincent
f005bbad96 Merge pull request #1785 from advaita13/wifi-only-fix 
Sync only when unmetered internet is available #1670
 2016-03-24 14:26:03 +01:00
Dominik Schürmann
c4de57d4f6 Merge pull request #1782 from fiaxh/share_key_mime 
Set MIME application/pgp-keys when sending a key
 2016-03-24 13:52:04 +01:00
Lubo Viluda
298f89d36e upgrade of Redirect import activity 
-> RedirectImportActivity is transparent now
-> some poinlessly data removed
-> String moved into sources
-> xml for activity simplified
 2016-03-24 00:54:28 +01:00
Vincent Breitmoser
4c61b4c892 use new TokenAutoComplete 2.0.7, fixes #1636 2016-03-23 22:46:25 +01:00
Vincent Breitmoser
c917262957 get rid of code path for pin and notation data handling 2016-03-23 17:49:26 +01:00
Advaita
cab3fa7874 Final commit 
All changes included

Improvements

-Reformatted code wherever required
-Only active wifi connections trigger events
-Improve sync reliability
-Removed extra permission

Minor Changes

-Refactored 2 variables for easier readbility
-Wifi-Only-Sync is now enabled by default
 2016-03-23 20:54:10 +05:30
Durgesh
a8603d6974 Fix CertifyKeyActivity back button on action bar not working #1758 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-22 20:28:36 +01:00
Lubo Viluda
7efeebc638 #1661 - Don't expose CertifyActivity 
*Add new activity - RedirectImportKeysActivity, which prompts user to
use Openkeychain directly
*Add intent filter for the activity
*Change intent filter for CertifyActivity
 2016-03-20 11:52:36 +01: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
fiaxh
966948d79b Set MIME application/pgp-keys when sending a key 2016-03-14 23:06:49 +01:00
Michal Kepkowski
6c2efb0235 okhttp3 2016-03-14 17:41:18 +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
fiaxh
4d347f1a8e Fix display of keyserver item in dark theme 2016-03-10 01:42:39 +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
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