cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,925 Commits 1 Branch 0 Tags
7ec84230b0bc0bbe8f48d87e55c1162ac5ff2d4c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 7ec84230b0 Fix crash with coinbase handle 2016-11-30 19:16:09 +01:00
Dominik Schürmann bf43f40222 Re-add string accidentally deleted on merge conflict 2016-11-30 18:58:54 +01:00
Dominik Schürmann 7d7a184f79 Fix account crash on Android 7, fixes #1956 2016-11-30 18:41:11 +01:00
Dominik SchürmannandGitHub b02f50dd22 Merge pull request #1953 from open-keychain/openpgp-signature-result-v4 
Openpgp signature result v4
 2016-11-30 16:28:16 +01:00
Dominik Schürmann 47b651e669 Merge branch 'tobsbot-recycler-view-keylist' 2016-11-30 15:17:14 +01:00
Dominik Schürmann 740d3fa72c Small UI alignments 2016-11-30 15:13:34 +01:00
Dominik Schürmann cecacb79e5 Use fastscroll library 2016-11-30 15:07:16 +01:00
Dominik Schürmann efb1868791 Fix merge conflicts 2016-11-30 13:46:50 +01:00
Dominik Schürmann d826e2c32e Merge branch 'import-refactor' 2016-11-30 01:01:22 +01:00
Dominik Schürmann a67e8c6dd6 Inline progress for download and import 2016-11-30 01:00:48 +01:00
Dominik Schürmann 921575ff1e Code cleanup 2016-11-29 23:07:43 +01:00
Dominik Schürmann 6fe0ba829c Show result in Notify after import 2016-11-29 22:46:46 +01:00
Dominik Schürmann 61425d6cf0 More descriptive class name for search fragment 2016-11-29 22:26:49 +01:00
Dominik Schürmann 2e6d0fb05c Fix onAttach deprecation 2016-11-29 22:24:27 +01:00
Dominik Schürmann c23139a3fe Fix import from keyservers using URL Intent 2016-11-29 22:04:21 +01:00
Dominik Schürmann d43d4967e2 Use desktop User-Agent for Facebook to workaround bug 2016-11-22 00:15:12 +01:00
Dominik Schürmann e267c3ca6c Remove waffle.io 2016-11-21 23:23:48 +01:00
Dominik Schürmann bc08d7dda6 Update copyright header 2016-11-21 23:16:36 +01:00
Dominik Schürmann fe2e4abef9 Fix BindingAdapter warnings 2016-11-21 23:12:06 +01:00
Dominik Schürmann c3c1568de1 Add flattr 2016-11-07 22:27:27 +01:00
Dominik Schürmann 148f3f49bf Remove deprecated incremental option 2016-10-28 15:08:27 +02:00
Dominik Schürmann 0ae3dc7736 Re-enable gradle witness 2016-10-28 15:04:32 +02:00
Dominik Schürmann e9446308d4 Update dependencies 2016-10-28 15:02:25 +02:00
Dominik Schürmann c14594d980 Fix NPE in ParcelableHkpKeyserver 2016-10-27 19:30:10 +02:00
Dominik Schürmann 0dbe067ade Resolve merge conflicts 2016-10-27 19:03:37 +02:00
Dominik Schürmann f242d80c16 UI for onion keyserver, fix preference upgrade 2016-10-27 17:01:22 +02:00
Dominik Schürmann 911fa020c2 Preparations for support of onion keyservers. Refactoring of Keyserver and proxy related classes 2016-10-27 16:19:43 +02:00
Dominik Schürmann bf382ec59d Update PayPal email 2016-08-26 10:01:28 +02:00
Dominik SchürmannandGitHub 6a80c51a59 Merge pull request #1923 from nmikhailov/travis_fix 
Travis cleanup
 2016-08-23 19:02:34 +02:00
Dominik SchürmannandGitHub 3cc2f549ef Merge pull request #1921 from open-keychain/dep-no-deprecate-snackbar 
ignore deprecated snackbar in dependencyci.yml
 2016-08-23 01:03:57 +02:00
Dominik SchürmannandGitHub db888140d2 Merge pull request #1915 from nmikhailov/travis_fix 
Fix travis android-24 dep
 2016-08-18 20:41:11 +02:00
Dominik SchürmannandGitHub 4d5c18b0b6 Merge pull request #1916 from runnerway/readme 
README: Fix commands to run tests
 2016-08-18 18:29:27 +02:00
Dominik Schürmann 9adaf1434f Block 20 most chosen PINs 2016-08-16 03:23:43 +02:00
Dominik Schürmann 0733984e3f 4.2 beta1 2016-08-15 14:31:45 +02:00
Dominik Schürmann ac1c20f961 Update build environment to SDK 24 2016-08-15 08:37:23 +02:00
Dominik SchürmannandGitHub 356eb23c5d Merge pull request #1886 from runnerway/test-01 
Instrumented unit tests: fix for execution
 2016-08-15 08:11:48 +02:00
Dominik SchürmannandGitHub de0c02e044 Merge pull request #1868 from nmikhailov/nitrokey 
WIP: Security token USB handling improvements
 2016-08-15 07:46:27 +02:00
Dominik Schürmann 907e8aa6e6 Version 4.1 2016-08-08 17:56:42 +02:00
Dominik Schürmann f56a755ee8 Update from transifex 2016-08-08 17:52:31 +02:00
Dominik Schürmann 4063eed531 Update changelog 2016-08-08 17:45:13 +02:00
Dominik Schürmann 166ac9832b Merge branch 'master' of github.com:open-keychain/open-keychain 2016-07-11 10:55:30 +02:00
Dominik Schürmann 0ad0023fac Passphrase dialog: Button to switch between keyboard layouts 2016-07-11 10:55:05 +02:00
Dominik Schürmann 0011c5adac Version 4.1 beta3 2016-07-07 15:59:35 +02:00
Dominik Schürmann 826607db56 Version 4.0.3 2016-07-07 15:57:27 +02:00
Dominik Schürmann fe453ff011 Version 4.1 beta2 2016-07-07 14:43:06 +02:00
Dominik Schürmann b9fcd298df Version 4.0.2 2016-07-07 14:36:15 +02:00
Dominik Schürmann 6152553593 Pull from transifex 2016-07-07 14:33:34 +02:00
Dominik Schürmann 3b544065f7 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-07-07 13:10:28 +02:00
Dominik SchürmannandNikita Mikhailov 345178ccd1 Add Nitrokey device filter 2016-07-02 19:45:23 +06:00
Dominik Schürmann 72da8e98a6 4.1 beta1 2016-06-07 22:15:58 +02:00
Dominik Schürmann 24b92172be Fix license header 2016-05-25 15:18:53 +03:00
Dominik Schürmann 6e4db2c305 More string fixes from transifex 2016-05-20 15:57:27 +03:00
Dominik Schürmann c002239bc7 Improve section_decrypt 2016-05-20 15:50:24 +03:00
Dominik Schürmann 3193df9e82 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-05-20 15:48:24 +03:00
Dominik Schürmann 334f2bbdb0 Improve label_keyservers 2016-05-20 15:48:21 +03:00
Dominik Schürmann 5c924861a0 Merge pull request #1875 from AlexFJW/BackupWithStrippedMasterkey 
Added passphrase check for stripped masterkeys
 2016-05-20 15:44:10 +03:00
Dominik Schürmann df8081012f Version 4.0.1 2016-05-19 21:09:51 +03:00
Dominik Schürmann 583d4499c6 Decrease javaMaxHeapSize, fix F-Droid build 2016-05-19 21:08:58 +03:00
Dominik Schürmann 867764bbfd Version 4.0 2016-05-18 12:43:10 +03:00
Dominik Schürmann a7b18b3a1f Pull from transifex 2016-05-18 11:29:50 +03:00
Dominik Schürmann 8847a2e770 Changelog, contributors 2016-05-18 11:24:31 +03:00
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