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

1423 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
1cbecb1b3b Add missing 2 EUR selection for donation 2016-03-03 15:18:31 +01:00
Dominik Schürmann
7d3b903690 Transifex: pt_BR 2016-03-03 13:31:46 +01:00
Vincent Breitmoser
b1d0a67f42 some changelog for v3.9 2016-03-02 14:42:01 +01:00
tdjogi010@gmail.com
05accb4906 Alert for Stripping Subkeys. 2016-03-02 02:51:25 +05:30
Vincent
fd24acbf0e Merge pull request #1727 from open-keychain/mime-fallback 
try to guess if data is text or not
 2016-02-23 16:01:13 +01:00
unyoungwax
19967e2350 Remove AspectRatioImageView 2016-02-23 14:41:54 +08:00
unyoungwax
b0b6adc58b Resize QR code properly in landscape orientation 2016-02-23 14:41:26 +08:00
Vincent Breitmoser
4df63ccdeb displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu 2016-02-22 22:22:45 +01:00
Vincent Breitmoser
bdae99c084 mime: try to decode with given charset or utf-8 while file is read 2016-02-22 17:03:24 +01:00
Dominik Schürmann
0e22813f03 Fix landscape orientation 2016-02-10 19:09:55 +01:00
Dominik Schürmann
0feb4d074c Use non-breaking spaces for backup code MaskedEditText 2016-02-10 18:48:27 +01:00
Dominik Schürmann
a2ea509f06 Backup format v2: redesign restore dialog 2016-02-10 18:48:27 +01:00
Dominik Schürmann
713f3076f4 Backup format v2: redesigned backup code fragment with masked edit text 2016-02-10 18:48:27 +01:00
Theo Franzén
0191cf92db Better transaction animation 2016-02-10 15:28:59 +01:00
Dominik Schürmann
751298a4d8 Fix EUR symbol 2016-02-10 12:34:44 +01:00
Dominik Schürmann
2bf9634fd6 Add donation fragment 2016-02-09 20:48:24 +01:00
Dominik Schürmann
fa2958c65a Remove leftovers from spongycastle 2016-02-09 00:34:16 +01:00
Dominik Schürmann
79db5c0ebe Replace spongycastle with bouncycastle 2016-02-09 00:24:46 +01:00
Dominik Schürmann
cbf6f15d91 Fix number keypad preference 2016-02-04 12:50:21 +01:00
Vincent Breitmoser
48dd3d09e6 import: handle FileNotFoundException (fixes #1688) 2016-02-01 15:24:48 +01:00