aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ssh authentication supportHEADmasterhsm2016-05-2910-25/+154
|
* 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
| |\ | | | | | | Added passphrase check for stripped masterkeys
| | * 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
|/ /
* | Version 4.0.1Dominik Schürmann2016-05-191-2/+2
| |
* | Decrease javaMaxHeapSize, fix F-Droid buildDominik Schürmann2016-05-191-1/+1
| |
* | Version 4.0Dominik Schürmann2016-05-181-2/+2
| |
* | Pull from transifexDominik Schürmann2016-05-1839-98/+641
| |
* | Changelog, contributorsDominik Schürmann2016-05-182-0/+10
|/
* rename ExportTest to BackupOperationTestVincent Breitmoser2016-05-171-1/+1
|
* refactor BackupOperation a bit, make more illegal states explicitVincent Breitmoser2016-05-173-61/+126
|
* 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-1728-84/+69
|\ | | | | Shifted duplicate method implementations from KeyRing to openpgp-api …
| * Slight changes for consistencyAlex Fong2016-05-162-3/+3
| |
| * Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-1528-84/+69
| |
* | Merge pull request #1871 from runnerway/ui-01Vincent2016-05-176-92/+33
|\ \ | | | | | | Minor UI improvements and cleanup
| * | Padding cleanupAndrea Torlaschi2016-05-172-47/+29
| | |
| * | Remove dividersAndrea Torlaschi2016-05-172-15/+0
| | | | | | | | | | | | Divider shouldn't be used after last item
| * | Settings: remove unuseful initializationAndrea Torlaschi2016-05-173-20/+1
| | |
| * | Settings: change CheckBoxPreference to SwitchPreferenceAndrea Torlaschi2016-05-173-12/+5
|/ /
* | Merge pull request #1869 from nmikhailov/debuggable_buildsDominik Schürmann2016-05-171-7/+11
|\ \ | |/ |/| Add new build type to mitigate debugging issues
| * Add new build type to mitigate debugging issuesNikita Mikhailov2016-05-171-7/+11
|/
* Revert "Remove non-encrypted backuping"Dominik Schürmann2016-05-121-14/+31
| | | | This reverts commit 5b87b648559b9c6e8dd8096da38cf712e696e4c0.
* 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
| | | | | | | This reverts commit 72d2a627ff7641a660628ed5d634209a93efebd2. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
* service: support progress reporting through a messenger in decryptVerifyVincent Breitmoser2016-05-112-9/+54
|
* update progress handling in PgpDecryptVerifyOperationVincent Breitmoser2016-05-114-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/masterDominik Schürmann2016-05-115-159/+109
|\ | | | | Fixed 'Orbot appears not to be running' (#1792)
| * Removed authorship, added license etc.vanitasvitae2016-05-111-8/+23
| |
| * Fixed 'Orbot appears not to be running' (#1792)vanitasvitae2016-05-115-159/+94
| |
* | Merge pull request #1771 from runnerway/refactoring-operationDominik Schürmann2016-05-1113-391/+564
|\ \ | |/ |/| PgpSignEncryptOperation refactoring
| * PgpSignEncryptOperation refactoringAndrea Torlaschi2016-05-1013-391/+564
|/
* Travis: use old workaround due to ↵Dominik Schürmann2016-05-081-2/+9
| | | | https://github.com/travis-ci/travis-ci/issues/5669
* Merge pull request #1860 from mgeier63/masterDominik Schürmann2016-05-081-2/+2
|\ | | | | in OpenPgpServiceTest, use new service interface instead of deprecated old interface
| * use new service interface instead of deprecated old interfacemgeier632016-05-081-2/+2
| |
* | Merge pull request #1858 from nmikhailov/fix4kDominik Schürmann2016-05-081-17/+32
|\ \ | |/ |/| SecurityToken: add support for 3072 & 4096bit RSA keys
| * SecurityToken: add support for 3072 & 4096bit RSA keysNikita Mikhailov2016-05-081-17/+32
|/
* Update openpgp-api-libDominik Schürmann2016-05-072-1/+0
|
* Merge branch 'backup-api'Dominik Schürmann2016-05-0712-31/+221
|\
| * Update openpgp-api-libDominik Schürmann2016-05-071-0/+0
| |
| * Merge branch 'master' into backup-apiDominik Schürmann2016-05-07272-4349/+12274
| |\ | |/ |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 06:14:24 +0000