cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,729 Commits 1 Branch 0 Tags
5d5d2c3c36c77b22a90acae33adb6908c4d7b5d9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 320909f3ce Merge pull request #1869 from nmikhailov/debuggable_builds 
Add new build type to mitigate debugging issues
 2016-05-17 00:21:15 +03:00
Dominik Schürmann 664386afec Revert "Remove non-encrypted backuping" 
This reverts commit 5b87b64855.
 2016-05-12 15:33:19 +03:00
Dominik Schürmann 5b87b64855 Remove non-encrypted backuping 2016-05-12 15:23:07 +03:00
Dominik Schürmann 317f46990f Fix license header 2016-05-12 15:10:44 +03:00
Dominik Schürmann 74d4421ab0 Fix NPE in NetworkReceiver 2016-05-12 15:05:01 +03: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
Dominik Schürmann b362668f81 Merge pull request #1865 from vanitasvitae/master 
Fixed 'Orbot appears not to be running' (#1792)
 2016-05-11 16:50:18 +03:00
Dominik Schürmann 39849c2c57 Merge pull request #1771 from runnerway/refactoring-operation 
PgpSignEncryptOperation refactoring
 2016-05-11 09:00:22 +03:00
Dominik Schürmann c8a0eb3a08 Travis: use old workaround due to https://github.com/travis-ci/travis-ci/issues/5669 2016-05-08 16:20:17 +03:00
Dominik Schürmann a013f4a49d Merge pull request #1860 from mgeier63/master 
in OpenPgpServiceTest, use new service interface instead of deprecated old interface
 2016-05-08 14:55:51 +03:00
Dominik Schürmann 5bb4b1955e Merge pull request #1858 from nmikhailov/fix4k 
SecurityToken: add support for 3072 & 4096bit RSA keys
 2016-05-08 14:51:24 +03:00
Dominik Schürmann b610dd5897 Update openpgp-api-lib 2016-05-07 12:31:25 +03:00
Dominik Schürmann 9306b5ce32 Merge branch 'backup-api' 2016-05-07 12:24:27 +03:00
Dominik Schürmann c8b112c70d Update openpgp-api-lib 2016-05-07 12:20:54 +03:00
Dominik Schürmann 7dd5e22353 Merge branch 'master' into backup-api 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	extern/openpgp-api-lib
 2016-05-07 12:01:16 +03:00
Dominik Schürmann d4612b5e17 Merge pull request #1855 from AlexFJW/ImportKeyFix 
Fixes bug for #1854
 2016-05-07 11:45:22 +03:00
Dominik Schürmann 6f35a5565a Version 3.9.6 beta 2016-05-05 14:41:46 +03:00
Dominik Schürmann da92e5f376 Merge branch 'AlexFJW-StrippedChangePass' 2016-05-05 14:37:09 +03:00
Dominik Schürmann eeb6fa5755 Fix formatting 2016-05-05 14:35:08 +03: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
Dominik Schürmann 20194107e6 Merge pull request #1850 from nmikhailov/master 
Fix rotation crash in CreateSecurityTokenWaitFragment #1849
 2016-05-01 18:18:55 +02: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 1cc0fe558b Remove lefover comment 2016-04-30 15:35:20 +02:00
Dominik Schürmann d72001c690 Fix animation in manage keys for security tokens 2016-04-30 15:24:09 +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 5805cd4d0a Fix createUserId 2016-04-29 23:52:01 +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 6a8a10336b Merge branch 'LuboViluda-master' 2016-04-29 23:14:33 +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 fad63cc76f Use StringBuilder.append() according to lint 2016-04-29 22:37:52 +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 8e6326faf7 Merge branch '007durgesh219-Issue#925' 2016-04-29 21:51:10 +02:00
Dominik Schürmann a242881da6 Include only add button in dropdown width 2016-04-29 21:50:54 +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 0ef59e36ad Merge pull request #1816 from fiaxh/no_name_choose_email 
Correctly handle keys only having an email address
 2016-04-29 21:40:00 +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 120f71d791 Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt 
Fix Wrong file encrypted from cached input
 2016-04-29 21:24:15 +02:00
Dominik Schürmann 32f16ee7c3 Fix travis 2016-04-29 21:17:08 +02:00
Dominik Schürmann 9930d67521 Update more libraries 2016-04-29 21:09:20 +02:00
Dominik Schürmann 8e0324dbd8 Update build config, gitignore after testing 2016-04-29 17:27:28 +02:00
Dominik Schürmann 111ca4435e Update build tools for travis 2016-04-29 17:06:00 +02:00
Dominik Schürmann ab7f6fa992 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-04-29 17:03:57 +02:00
Dominik Schürmann 19e6103e5f Update libraries, add proguard filters to be under 64K limit 2016-04-29 17:03:50 +02:00
Dominik Schürmann 5fdc312b2d Version 3.9.5 2016-04-29 13:16:32 +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
Dominik Schürmann f1b14d338c Fix string 2016-04-16 00:51:31 +02:00
Dominik Schürmann 6126e3d9ae Merge pull request #1824 from nmikhailov/otg2 
[WIP] USB OTG Support for Yubikey
 2016-04-15 18:19:32 +02:00
Dominik Schürmann e08ae31797 Remove old keybase path 2016-04-13 18:57:21 +02:00
Dominik Schürmann a16c4bcc30 Version 3.95 beta 2016-04-13 17:12:48 +02:00
Dominik Schürmann ab323bddab Fix string 2016-04-13 17:00:24 +02:00
Dominik Schürmann 8bcd4003a9 KeybaseLib workaround 2016-04-12 19:42:54 +02:00
Dominik Schürmann 4ac63de83b Fix wrapper URL 2016-04-12 19:33:54 +02:00
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
Dominik Schürmann 8efef3d248 Merge pull request #1828 from nmikhailov/holder_text_fix 
Add missing keyholder string param
 2016-04-12 09:25:34 +02:00
Dominik Schürmann d3a34adb28 Merge branch 'kepuss-okhttp3' 2016-04-09 18:34:12 +02: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
Dominik Schürmann 4edb805ba1 Update keybase submodule 2016-04-09 11:45:09 +02: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
Dominik Schürmann f3712101c1 Version 3.9.4 2016-03-15 23:53:03 +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
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
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
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
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
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
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
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
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
Dominik Schürmann a3a87fad87 Update openpgp-api submodule 2016-03-03 13:12:51 +01:00
Dominik Schürmann 568e0ff380 Merge pull request #1737 from runnerway/backup-code-fix 
Fix backup code comparison
 2016-03-02 00:21:27 +01:00