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

3434 Commits

Author SHA1 Message Date
Dominik Schürmann
115c46d015 Update Android Gradle Plugin to 2.0 with workarounds 2016-04-12 19:28:00 +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
Dominik Schürmann
ff9226c25c Fix strings 2016-04-12 16:15:07 +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
Dominik Schürmann
c8e5395d4e Use cert pinning only if available 2016-04-09 18:34:00 +02:00
Dominik Schürmann
2d762e55da Okhttp3 cleanups, docs, and fix timeouts for default client 2016-04-09 11:53:37 +02:00
Michal Kepkowski
7b97c2bbed KeyBaseLib response Client 2016-04-08 19:10:59 +02:00
Michal Kepkowski
26bfe06d80 cleaning 2016-04-06 19:25:10 +02:00
Michal Kepkowski
d9988a8cda Merge branch 'master' into okhttp3 2016-04-06 19:16:10 +02:00
Michal Kepkowski
dac5f1db08 OKhttp url factory 2016-04-06 19:10:00 +02: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
Durgesh
aec4744b31 Fix Unusable signing key not properly disabled, Issue #1468 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-04-05 02:08:18 +05:30
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
e627006fcf setTitle now uses resource id directly 2016-04-01 10:34:52 +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
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
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
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
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