cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,040 Commits 1 Branch 0 Tags
7d09040cc6b46d5a1db6078c75f6a53f9f9a8310
Commit Graph

6040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Fong
c97d74b370 Changed HashMap to ArrayList<Pair> 2016-05-19 16:48:56 +08:00
Alex Fong
21430c0b49 Removed * import 2016-05-19 14:28:41 +08:00
Alex Fong
774c806f46 Added passphrase check for stripped masterkeys 2016-05-19 13:08:10 +08: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
Vincent Breitmoser
e292ec0d1a rename ExportTest to BackupOperationTest 2016-05-17 21:23:08 +02:00
Vincent Breitmoser
5d5d2c3c36 refactor BackupOperation a bit, make more illegal states explicit 2016-05-17 21:22:50 +02:00
Vincent Breitmoser
1da8e4c1ed make unencrypted backup an explicit parameter 2016-05-17 20:59:07 +02:00
Vincent Breitmoser
f833b0f2ef shorten pin preference string 2016-05-17 20:44:20 +02:00
Vincent
60c277b96f Merge pull request #1870 from AlexFJW/RemovedDuplicateCode 
Shifted duplicate method implementations from KeyRing to openpgp-api …
 2016-05-17 20:31:40 +02:00
Vincent
047b6b34b8 Merge pull request #1871 from runnerway/ui-01 
Minor UI improvements and cleanup
 2016-05-17 20:26:51 +02:00
Andrea Torlaschi
dc32ff2707 Padding cleanup 2016-05-17 17:48:59 +02:00
Andrea Torlaschi
7a7d32f706 Remove dividers 
Divider shouldn't be used after last item
 2016-05-17 17:20:01 +02:00
Andrea Torlaschi
2ab55b6767 Settings: remove unuseful initialization 2016-05-17 17:09:03 +02:00
Andrea Torlaschi
a2d2da9098 Settings: change CheckBoxPreference to SwitchPreference 2016-05-17 16:51:44 +02: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
Nikita Mikhailov
bfa18dc79e Add new build type to mitigate debugging issues 2016-05-17 01:21:29 +06:00
Alex Fong
7b02161ce7 Slight changes for consistency 2016-05-16 00:59:57 +08:00
Alex Fong
614f46a630 Shifted duplicate method implementations from KeyRing to openpgp-api submodule 2016-05-15 23:26:09 +08:00
Nikita Mikhailov
3656cbd539 Add new build type to mitigate debugging issues 2016-05-14 22:43:38 +06: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
Vincent Breitmoser
c59a32b6a7 service: support progress reporting through a messenger in decryptVerify 2016-05-11 16:17:01 +02:00
Vincent Breitmoser
48758cdec5 update progress handling in PgpDecryptVerifyOperation 
- less progress messages overall
- report progress again based on input stream position, if filesize is known
- limit progress messages to one every 200ms while decrypting
- also fixed a bug in DecryptListFragment, the recycler view now reuses
  old views as intended instead of crossfading all the time.
 2016-05-11 16:17:01 +02: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
vanitasvitae
26a7372454 Removed authorship, added license etc. 2016-05-11 13:37:34 +02:00
Dominik Schürmann
39849c2c57 Merge pull request #1771 from runnerway/refactoring-operation 
PgpSignEncryptOperation refactoring
 2016-05-11 09:00:22 +03:00
vanitasvitae
8e250e0b5d Fixed 'Orbot appears not to be running' (#1792) 2016-05-11 02:06:21 +02:00
Andrea Torlaschi
c942d8b2ff PgpSignEncryptOperation refactoring 2016-05-10 23:38:11 +02: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
mgeier63
881f3a4826 use new service interface instead of deprecated old interface 2016-05-08 11:44:18 +02:00
Nikita Mikhailov
f54267dd68 SecurityToken: add support for 3072 & 4096bit RSA keys 2016-05-08 02:44:04 +06: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
Alex Fong
2f33fe3118 A simple fix to clear the list of detected keys when parsing key file gives an error. 2016-05-07 08:44:59 +08:00
Vincent Breitmoser
5e9de4447c external-provider: only allow permission check for caller package names 2016-05-06 12:54:35 +02: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