Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Remove non-encrypted backuping" | Dominik Schürmann | 2016-05-12 | 1 | -14/+31 |
| | | | | This reverts commit 5b87b648559b9c6e8dd8096da38cf712e696e4c0. | ||||
* | Remove non-encrypted backuping | Dominik Schürmann | 2016-05-12 | 1 | -31/+14 |
| | |||||
* | Fix license header | Dominik Schürmann | 2016-05-12 | 12 | -7/+178 |
| | |||||
* | Fix NPE in NetworkReceiver | Dominik Schürmann | 2016-05-12 | 1 | -2/+3 |
| | |||||
* | Revert "Add + button besides TokenAutoComplete, Issue #925" | Dominik Schürmann | 2016-05-12 | 3 | -36/+1 |
| | | | | | | | This reverts commit 72d2a627ff7641a660628ed5d634209a93efebd2. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java | ||||
* | service: support progress reporting through a messenger in decryptVerify | Vincent Breitmoser | 2016-05-11 | 2 | -9/+54 |
| | |||||
* | update progress handling in PgpDecryptVerifyOperation | Vincent Breitmoser | 2016-05-11 | 4 | -40/+36 |
| | | | | | | | | - 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. | ||||
* | Merge pull request #1865 from vanitasvitae/master | Dominik Schürmann | 2016-05-11 | 5 | -159/+109 |
|\ | | | | | Fixed 'Orbot appears not to be running' (#1792) | ||||
| * | Removed authorship, added license etc. | vanitasvitae | 2016-05-11 | 1 | -8/+23 |
| | | |||||
| * | Fixed 'Orbot appears not to be running' (#1792) | vanitasvitae | 2016-05-11 | 5 | -159/+94 |
| | | |||||
* | | Merge pull request #1771 from runnerway/refactoring-operation | Dominik Schürmann | 2016-05-11 | 13 | -391/+564 |
|\ \ | |/ |/| | PgpSignEncryptOperation refactoring | ||||
| * | PgpSignEncryptOperation refactoring | Andrea Torlaschi | 2016-05-10 | 13 | -391/+564 |
|/ | |||||
* | Travis: use old workaround due to ↵ | Dominik Schürmann | 2016-05-08 | 1 | -2/+9 |
| | | | | https://github.com/travis-ci/travis-ci/issues/5669 | ||||
* | Merge pull request #1860 from mgeier63/master | Dominik Schürmann | 2016-05-08 | 1 | -2/+2 |
|\ | | | | | in OpenPgpServiceTest, use new service interface instead of deprecated old interface | ||||
| * | use new service interface instead of deprecated old interface | mgeier63 | 2016-05-08 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #1858 from nmikhailov/fix4k | Dominik Schürmann | 2016-05-08 | 1 | -17/+32 |
|\ \ | |/ |/| | SecurityToken: add support for 3072 & 4096bit RSA keys | ||||
| * | SecurityToken: add support for 3072 & 4096bit RSA keys | Nikita Mikhailov | 2016-05-08 | 1 | -17/+32 |
|/ | |||||
* | Update openpgp-api-lib | Dominik Schürmann | 2016-05-07 | 2 | -1/+0 |
| | |||||
* | Merge branch 'backup-api' | Dominik Schürmann | 2016-05-07 | 12 | -31/+221 |
|\ | |||||
| * | Update openpgp-api-lib | Dominik Schürmann | 2016-05-07 | 1 | -0/+0 |
| | | |||||
| * | Merge branch 'master' into backup-api | Dominik Schürmann | 2016-05-07 | 272 | -4349/+12274 |
| |\ | |/ |/| | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib | ||||
* | | Merge pull request #1855 from AlexFJW/ImportKeyFix | Dominik Schürmann | 2016-05-07 | 1 | -0/+1 |
|\ \ | | | | | | | Fixes bug for #1854 | ||||
| * | | A simple fix to clear the list of detected keys when parsing key file gives ↵ | Alex Fong | 2016-05-07 | 1 | -0/+1 |
|/ / | | | | | | | an error. | ||||
* | | external-provider: only allow permission check for caller package names | Vincent Breitmoser | 2016-05-06 | 2 | -36/+47 |
| | | |||||
* | | Version 3.9.6 beta | Dominik Schürmann | 2016-05-05 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'AlexFJW-StrippedChangePass' | Dominik Schürmann | 2016-05-05 | 19 | -105/+358 |
|\ \ | |||||
| * | | Fix formatting | Dominik Schürmann | 2016-05-05 | 2 | -4/+4 |
| | | | |||||
| * | | Revert "Added warning dialog for importing keys" | Dominik Schürmann | 2016-05-05 | 2 | -29/+0 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456. Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | | Slight amendments for clarity | Alex Fong | 2016-05-05 | 3 | -2/+5 |
| | | | |||||
| * | | Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel | Alex Fong | 2016-05-05 | 12 | -28/+38 |
| | | | |||||
| * | | Added license to ChangeUnlockOperation | Alex Fong | 2016-05-05 | 1 | -0/+17 |
| | | | |||||
| * | | Edited comments | Alex Fong | 2016-05-05 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed warnings encountered | Alex Fong | 2016-05-05 | 2 | -2/+1 |
| | | | |||||
| * | | Added warning dialog for importing keys | Alex Fong | 2016-05-05 | 2 | -0/+29 |
| | | | |||||
| * | | Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵ | Alex Fong | 2016-05-05 | 17 | -206/+173 |
| | | | | | | | | | | | | into ChangeUnlockParcel. | ||||
| * | | Removed unrequired code, standardized terms used. | Alex Fong | 2016-05-05 | 3 | -32/+15 |
| | | | |||||
| * | | Refactored code to use functions already present in code, reduced liberties ↵ | Alex Fong | 2016-05-05 | 2 | -28/+29 |
| | | | | | | | | | | | | | | | | | | | | | taken when modifying functions. Todo: Fix indentation for error messages | ||||
| * | | (WIP) Change password when key is stripped #1692 | Alex Fong | 2016-05-04 | 20 | -73/+346 |
|/ / | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | api: add a comment explaining use of wrapperBundle | Vincent Breitmoser | 2016-05-04 | 1 | -0/+1 |
| | | |||||
* | | api: ACTION_GET_KEY selects by any subkey, rather than just master key id | Vincent Breitmoser | 2016-05-04 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #1850 from nmikhailov/master | Dominik Schürmann | 2016-05-01 | 1 | -2/+2 |
|\ \ | | | | | | | Fix rotation crash in CreateSecurityTokenWaitFragment #1849 | ||||
| * | | Fix rotation crash in CreateSecurityTokenWaitFragment | Nikita Mikhailov | 2016-05-01 | 1 | -2/+2 |
|/ / | |||||
* | | Fix error codes for ykneo-openpgp 1.0.11 | Dominik Schürmann | 2016-04-30 | 2 | -27/+52 |
| | | |||||
* | | Remove lefover comment | Dominik Schürmann | 2016-04-30 | 1 | -1/+1 |
| | | |||||
* | | Fix animation in manage keys for security tokens | Dominik Schürmann | 2016-04-30 | 9 | -30/+47 |
| | | |||||
* | | Improve security_token_error_iso_dep_not_supported | Dominik Schürmann | 2016-04-30 | 1 | -1/+1 |
| | | |||||
* | | Fix german title from transifex | Dominik Schürmann | 2016-04-30 | 1 | -1/+1 |
| | | |||||
* | | Fix createUserId | Dominik Schürmann | 2016-04-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1819 from 007durgesh219/Issue#1817 | Dominik Schürmann | 2016-04-29 | 7 | -24/+32 |
|\ \ | | | | | | | Fix Crash when no encryption subkey is available, Issue #1817 | ||||
| * | | Fix Crash when no encryption subkey is available, Issue #1817 | Durgesh | 2016-04-14 | 7 | -24/+32 |
| | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> |