aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #1855 from AlexFJW/ImportKeyFixDominik Schürmann2016-05-071-0/+1
|\ \ | | | | | | Fixes bug for #1854
| * | A simple fix to clear the list of detected keys when parsing key file gives ↵Alex Fong2016-05-071-0/+1
|/ / | | | | | | an error.
* | external-provider: only allow permission check for caller package namesVincent Breitmoser2016-05-062-36/+47
| |
* | Version 3.9.6 betaDominik Schürmann2016-05-051-2/+2
| |
* | Merge branch 'AlexFJW-StrippedChangePass'Dominik Schürmann2016-05-0519-105/+358
|\ \
| * | Fix formattingDominik Schürmann2016-05-052-4/+4
| | |
| * | Revert "Added warning dialog for importing keys"Dominik Schürmann2016-05-052-29/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456. Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * | Slight amendments for clarityAlex Fong2016-05-053-2/+5
| | |
| * | Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcelAlex Fong2016-05-0512-28/+38
| | |
| * | 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 ↵Alex Fong2016-05-0517-206/+173
| | | | | | | | | | | | into ChangeUnlockParcel.
| * | Removed unrequired code, standardized terms used.Alex Fong2016-05-053-32/+15
| | |
| * | Refactored code to use functions already present in code, reduced liberties ↵Alex Fong2016-05-052-28/+29
| | | | | | | | | | | | | | | | | | | | | taken when modifying functions. Todo: Fix indentation for error messages
| * | (WIP) Change password when key is stripped #1692Alex Fong2016-05-0420-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 wrapperBundleVincent Breitmoser2016-05-041-0/+1
| |
* | api: ACTION_GET_KEY selects by any subkey, rather than just master key idVincent Breitmoser2016-05-041-1/+2
| |
* | Merge pull request #1850 from nmikhailov/masterDominik Schürmann2016-05-011-2/+2
|\ \ | | | | | | Fix rotation crash in CreateSecurityTokenWaitFragment #1849
| * | Fix rotation crash in CreateSecurityTokenWaitFragmentNikita Mikhailov2016-05-011-2/+2
|/ /
* | Fix error codes for ykneo-openpgp 1.0.11Dominik Schürmann2016-04-302-27/+52
| |
* | Remove lefover commentDominik Schürmann2016-04-301-1/+1
| |
* | Fix animation in manage keys for security tokensDominik Schürmann2016-04-309-30/+47
| |
* | Improve security_token_error_iso_dep_not_supportedDominik Schürmann2016-04-301-1/+1
| |
* | Fix german title from transifexDominik Schürmann2016-04-301-1/+1
| |
* | Fix createUserIdDominik Schürmann2016-04-291-1/+1
| |
* | Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-297-24/+32
|\ \ | | | | | | Fix Crash when no encryption subkey is available, Issue #1817
| * | Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-147-24/+32
| | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 00:32:26 +0000