Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed HashMap to ArrayList<Pair> | Alex Fong | 2016-05-19 | 1 | -13/+13 |
| | |||||
* | Removed * import | Alex Fong | 2016-05-19 | 1 | -1/+3 |
| | |||||
* | Added passphrase check for stripped masterkeys | Alex Fong | 2016-05-19 | 1 | -18/+57 |
| | |||||
* | make unencrypted backup an explicit parameter | Vincent Breitmoser | 2016-05-17 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1870 from AlexFJW/RemovedDuplicateCode | Vincent | 2016-05-17 | 19 | -24/+43 |
|\ | | | | | Shifted duplicate method implementations from KeyRing to openpgp-api … | ||||
| * | Shifted duplicate method implementations from KeyRing to openpgp-api submodule | Alex Fong | 2016-05-15 | 19 | -24/+43 |
| | | |||||
* | | Settings: remove unuseful initialization | Andrea Torlaschi | 2016-05-17 | 1 | -14/+0 |
| | | |||||
* | | Settings: change CheckBoxPreference to SwitchPreference | Andrea Torlaschi | 2016-05-17 | 1 | -3/+2 |
|/ | |||||
* | 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 | ||||
* | update progress handling in PgpDecryptVerifyOperation | Vincent Breitmoser | 2016-05-11 | 1 | -1/+6 |
| | | | | | | | | - 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. | ||||
* | PgpSignEncryptOperation refactoring | Andrea Torlaschi | 2016-05-10 | 2 | -7/+14 |
| | |||||
* | Merge branch 'master' into backup-api | Dominik Schürmann | 2016-05-07 | 45 | -2119/+1927 |
|\ | | | | | | | | | | | 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. | ||||
| * | 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 | 2 | -4/+6 |
| | | |||||
| * | 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 | 3 | -20/+15 |
| | | | | | | | | into ChangeUnlockParcel. | ||||
| * | (WIP) Change password when key is stripped #1692 | Alex Fong | 2016-05-04 | 3 | -10/+12 |
| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | 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 | 6 | -24/+42 |
| | | |||||
| * | Merge pull request #1819 from 007durgesh219/Issue#1817 | Dominik Schürmann | 2016-04-29 | 2 | -0/+11 |
| |\ | | | | | | | Fix Crash when no encryption subkey is available, Issue #1817 | ||||
| | * | Fix Crash when no encryption subkey is available, Issue #1817 | Durgesh | 2016-04-14 | 2 | -0/+11 |
| | | | | | | | | | | | | 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 | ||||
| * | | | Re-enable move-to-card option, improve strings | Dominik Schürmann | 2016-04-29 | 4 | -89/+81 |
| | | | | |||||
| * | | | Include only add button in dropdown width | Dominik Schürmann | 2016-04-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain ↵ | Dominik Schürmann | 2016-04-29 | 2 | -0/+27 |
| |\ \ \ | | | | | | | | | | | | | | | | into 007durgesh219-Issue#925 | ||||
| | * | | | Add + button besides TokenAutoComplete, Issue #925 | Durgesh | 2016-04-14 | 2 | -0/+27 |
| | | |/ | | |/| | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
| * | | | Merge pull request #1831 from fiaxh/key_creation_flexible | Dominik Schürmann | 2016-04-29 | 4 | -75/+50 |
| |\ \ \ | | | | | | | | | | | Handle user input on key creation more generously | ||||
| | * | | | Handle user input on key creation more generously | fiaxh | 2016-04-15 | 4 | -75/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Allow empty name and do not regex-check email fixes #1825 | ||||
| * | | | | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt | Dominik Schürmann | 2016-04-29 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Fix Wrong file encrypted from cached input | ||||
| | * | | | | Fix Wrong file encrypted from cached input | Durgesh | 2016-04-15 | 1 | -0/+2 |
| | | |/ / | | |/| | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
| * | | | | Update libraries, add proguard filters to be under 64K limit | Dominik Schürmann | 2016-04-29 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Check subkey id instead of masterkey id on security token operations | Nikita Mikhailov | 2016-04-16 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Rename ambiguous getMasterKeyFingerprint -> getKeyFingerprint | ||||
| * | | | | Check if security token keys match required once before signing/decryption | Nikita Mikhailov | 2016-04-16 | 1 | -0/+16 |
| | | | | | |||||
| * | | | | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 3 | -17/+17 |
| | | | | | |||||
| * | | | | OTG: Skip TokenWaitFragmen when otg device is connected | Nikita Mikhailov | 2016-04-15 | 3 | -11/+27 |
| | | | | |