aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* ssh authentication supportHEADmasterhsm2016-05-298-24/+153
* Fix license headerDominik Schürmann2016-05-251-3/+0
* More string fixes from transifexDominik Schürmann2016-05-202-2/+2
* Improve section_decryptDominik Schürmann2016-05-201-1/+1
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-05-201-17/+58
|\
| * Merge pull request #1875 from AlexFJW/BackupWithStrippedMasterkeyDominik Schürmann2016-05-201-17/+58
| |\
| | * Changed HashMap to ArrayList<Pair>Alex Fong2016-05-191-13/+13
| | * Removed * importAlex Fong2016-05-191-1/+3
| | * Added passphrase check for stripped masterkeysAlex Fong2016-05-191-18/+57
* | | Improve label_keyserversDominik Schürmann2016-05-201-1/+1
|/ /
* | Pull from transifexDominik Schürmann2016-05-1839-98/+641
* | Changelog, contributorsDominik Schürmann2016-05-182-0/+10
|/
* refactor BackupOperation a bit, make more illegal states explicitVincent Breitmoser2016-05-172-56/+124
* make unencrypted backup an explicit parameterVincent Breitmoser2016-05-174-16/+21
* shorten pin preference stringVincent Breitmoser2016-05-171-1/+1
* Merge pull request #1870 from AlexFJW/RemovedDuplicateCodeVincent2016-05-1726-77/+61
|\
| * Slight changes for consistencyAlex Fong2016-05-162-3/+3
| * Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-1526-77/+61
* | Padding cleanupAndrea Torlaschi2016-05-172-47/+29
* | Remove dividersAndrea Torlaschi2016-05-172-15/+0
* | Settings: remove unuseful initializationAndrea Torlaschi2016-05-173-20/+1
* | Settings: change CheckBoxPreference to SwitchPreferenceAndrea Torlaschi2016-05-173-12/+5
|/
* Revert "Remove non-encrypted backuping"Dominik Schürmann2016-05-121-14/+31
* Remove non-encrypted backupingDominik Schürmann2016-05-121-31/+14
* Fix license headerDominik Schürmann2016-05-1212-7/+178
* Fix NPE in NetworkReceiverDominik Schürmann2016-05-121-2/+3
* Revert "Add + button besides TokenAutoComplete, Issue #925"Dominik Schürmann2016-05-123-36/+1
* service: support progress reporting through a messenger in decryptVerifyVincent Breitmoser2016-05-111-9/+54
* update progress handling in PgpDecryptVerifyOperationVincent Breitmoser2016-05-114-40/+36
* Merge pull request #1865 from vanitasvitae/masterDominik Schürmann2016-05-115-159/+109
|\
| * Removed authorship, added license etc.vanitasvitae2016-05-111-8/+23
| * Fixed 'Orbot appears not to be running' (#1792)vanitasvitae2016-05-115-159/+94
* | PgpSignEncryptOperation refactoringAndrea Torlaschi2016-05-1012-349/+496
|/
* SecurityToken: add support for 3072 & 4096bit RSA keysNikita Mikhailov2016-05-081-17/+32
* Update openpgp-api-libDominik Schürmann2016-05-071-1/+0
* Merge branch 'master' into backup-apiDominik Schürmann2016-05-07248-4110/+12052
|\
| * A simple fix to clear the list of detected keys when parsing key file gives a...Alex Fong2016-05-071-0/+1
| * external-provider: only allow permission check for caller package namesVincent Breitmoser2016-05-062-36/+47
| * Fix formattingDominik Schürmann2016-05-052-4/+4
| * Revert "Added warning dialog for importing keys"Dominik Schürmann2016-05-052-29/+0
| * Slight amendments for clarityAlex Fong2016-05-053-2/+5
| * Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcelAlex Fong2016-05-054-6/+16
| * Added license to ChangeUnlockOperationAlex Fong2016-05-051-0/+17
| * Edited commentsAlex Fong2016-05-051-2/+2
| * Fixed warnings encounteredAlex Fong2016-05-052-2/+1
| * Added warning dialog for importing keysAlex Fong2016-05-052-0/+29
| * Refactoring: Removed PassphraseChangeParcel and placed its functionality into...Alex Fong2016-05-059-184/+151
| * Removed unrequired code, standardized terms used.Alex Fong2016-05-053-32/+15
| * Refactored code to use functions already present in code, reduced liberties t...Alex Fong2016-05-052-28/+29
| * (WIP) Change password when key is stripped #1692Alex Fong2016-05-0411-64/+338