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

5726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Alex Fong
6cf3e4c891 Slight amendments for clarity 2016-05-05 07:57:20 +08:00
Alex Fong
bc3aa44b22 Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel 2016-05-05 07:57:20 +08:00
Alex Fong
a5a2335673 Added license to ChangeUnlockOperation 2016-05-05 07:57:20 +08:00
Alex Fong
01c2e1429b Edited comments 2016-05-05 07:57:20 +08:00
Alex Fong
89cf3bb6d9 Fixed warnings encountered 2016-05-05 07:57:20 +08:00
Alex Fong
9d35dcb0e9 Added warning dialog for importing keys 2016-05-05 07:57:20 +08:00
Alex Fong
f43edcdd7a Refactoring: Removed PassphraseChangeParcel and placed its functionality into ChangeUnlockParcel. 2016-05-05 07:57:20 +08:00
Alex Fong
dfcde9242d Removed unrequired code, standardized terms used. 2016-05-05 07:57:01 +08:00
Alex Fong
b490be9c1c Refactored code to use functions already present in code, reduced liberties taken when modifying functions. 
Todo:
Fix indentation for error messages
 2016-05-05 07:56:26 +08:00
Alex Fong
525788359c (WIP) Change password when key is stripped #1692 
Approach:
Find the first unstripped secret key and use it for passphrase verification
All unstripped keys will have their passphrase changed to new passphrase, if possible.

Current Progress:
Changing the passphrase of keys works fine.
Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword"
may be possible if given the go-ahead.
 2016-05-04 22:36:23 +08:00
Vincent Breitmoser
6b7a0597af api: add a comment explaining use of wrapperBundle 2016-05-04 11:45:56 +02:00
Vincent Breitmoser
4c063ebe46 api: ACTION_GET_KEY selects by any subkey, rather than just master key id 2016-05-04 11:36:55 +02:00