Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | 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> | ||||
* | | | Merge branch 'LuboViluda-master' | Dominik Schürmann | 2016-04-29 | 3 | -4/+76 |
|\ \ \ | |||||
| * | | | Use proper ImportKeysProxyActivity to scan QR Codes | Dominik Schürmann | 2016-04-29 | 2 | -7/+8 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵ | Dominik Schürmann | 2016-04-29 | 3 | -4/+75 |
|/| | | | | | | | | | | | | | | | LuboViluda-master | ||||
| * | | | unnecesary code removed | Lubo Viluda | 2016-04-12 | 2 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | - setContentView removed - R.layout.redirect_import_keys_activity.xml removed | ||||
| * | | | Unnecesary code removed and string repaired | Lubo Viluda | 2016-04-12 | 4 | -11/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Unnecesary import from RedirectImportKeyActivity.java removed - ..\value-w820dp\dimens.xml was unnecesary - \..value\dimens.xml unnecasary line - string sources repaired | ||||
| * | | | Activity renamed | Lubo Viluda | 2016-04-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Activity renamed from startScanActivity to startQrCodeCaptureActivity | ||||
| * | | | Changed activity during RedirectKeysActivity | Lubo Viluda | 2016-04-04 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | QrCodeCaptureActivity is open instead ImportKeysActivity | ||||
| * | | | Theme change | Lubo Viluda | 2016-03-24 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | Theme.Keychain.Transparet is used | ||||
| * | | | upgrade of Redirect import activity | Lubo Viluda | 2016-03-24 | 5 | -98/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified | ||||
| * | | | #1661 - Don't expose CertifyActivity | Lubo Viluda | 2016-03-20 | 6 | -5/+156 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity |