Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Settings: remove unuseful initialization | Andrea Torlaschi | 2016-05-17 | 2 | -20/+0 |
| | |||||
* | Settings: change CheckBoxPreference to SwitchPreference | Andrea Torlaschi | 2016-05-17 | 1 | -3/+2 |
| | |||||
* | 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 | 2 | -27/+0 |
| | | | | | | | 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 | 1 | -9/+54 |
| | |||||
* | update progress handling in PgpDecryptVerifyOperation | Vincent Breitmoser | 2016-05-11 | 3 | -39/+34 |
| | | | | | | | | - 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 | 4 | -159/+103 |
|\ | | | | | 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 | 4 | -159/+88 |
| | | |||||
* | | PgpSignEncryptOperation refactoring | Andrea Torlaschi | 2016-05-10 | 12 | -349/+496 |
|/ | |||||
* | 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 | 1 | -1/+0 |
| | |||||
* | Merge branch 'master' into backup-api | Dominik Schürmann | 2016-05-07 | 108 | -2911/+5232 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib | ||||
| * | 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 |
| | | |||||
| * | Fix formatting | Dominik Schürmann | 2016-05-05 | 2 | -4/+4 |
| | | |||||
| * | Revert "Added warning dialog for importing keys" | Dominik Schürmann | 2016-05-05 | 1 | -27/+0 |
| | | | | | | | | | | | | | | This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456. Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Slight amendments for clarity | Alex Fong | 2016-05-05 | 2 | -1/+4 |
| | | |||||
| * | Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel | Alex Fong | 2016-05-05 | 4 | -6/+16 |
| | | |||||
| * | 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 | 1 | -0/+27 |
| | | |||||
| * | Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵ | Alex Fong | 2016-05-05 | 9 | -184/+151 |
| | | | | | | | | into ChangeUnlockParcel. | ||||
| * | Removed unrequired code, standardized terms used. | Alex Fong | 2016-05-05 | 2 | -31/+14 |
| | | |||||
| * | 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 | 10 | -64/+336 |
| | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | |||||
| * | 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 | 1 | -24/+49 |
| | | |||||
| * | 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 |
| | | |||||
| * | 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 | 6 | -24/+31 |
| |\ | | | | | | | Fix Crash when no encryption subkey is available, Issue #1817 | ||||
| | * | Fix Crash when no encryption subkey is available, Issue #1817 | Durgesh | 2016-04-14 | 6 | -24/+31 |
| | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
| * | | Use proper ImportKeysProxyActivity to scan QR Codes | Dominik Schürmann | 2016-04-29 | 1 | -5/+6 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵ | Dominik Schürmann | 2016-04-29 | 1 | -0/+58 |
| |\ \ | | | | | | | | | | | | | LuboViluda-master | ||||
| | * | | unnecesary code removed | Lubo Viluda | 2016-04-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | - setContentView removed - R.layout.redirect_import_keys_activity.xml removed | ||||
| | * | | Unnecesary code removed and string repaired | Lubo Viluda | 2016-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | Theme.Keychain.Transparet is used | ||||
| | * | | upgrade of Redirect import activity | Lubo Viluda | 2016-03-24 | 1 | -23/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> 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 | 1 | -0/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity | ||||
| * | | | Use StringBuilder.append() according to lint | Dominik Schürmann | 2016-04-29 | 1 | -2/+6 |
| | | | | |||||
| * | | | Re-enable move-to-card option, improve strings | Dominik Schürmann | 2016-04-29 | 4 | -89/+81 |
| | | | |