aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename DrawerBackupFragment to BackupRestoreFragmentDominik Schürmann2015-10-152-3/+3
|
* Cleanup in BackupCodeFragmentDominik Schürmann2015-10-151-16/+14
|
* Fix drawer selection for backupDominik Schürmann2015-10-151-1/+1
|
* Layout consistency for backup fragmentDominik Schürmann2015-10-154-435/+373
|
* Unify backup filenameDominik Schürmann2015-10-152-4/+5
|
* Dont force OpenKeychain in open with for pgp-keysDominik Schürmann2015-10-151-1/+1
|
* Open decrypted application/pgp-keys only in OpenKeychainDominik Schürmann2015-10-151-2/+7
|
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-094-39/+83
|\
| * Revert "viewkeyactivity: ask for passphrase for backup only if key has one"Vincent Breitmoser2015-10-091-29/+3
| | | | | | | | | | | | This reverts commit 3316cb65e6b739deb7d0652fcd16a9d9bedf8c5b. Committed to wrong branch, derp :)
| * fix variable name mistake (wth did I commit there?!)Vincent Breitmoser2015-10-091-2/+2
| |
| * viewkeyactivity: ask for passphrase for backup only if key has oneVincent Breitmoser2015-10-091-3/+29
| |
| * make openInputStreamSafe static and move to FileHelperVincent Breitmoser2015-10-092-87/+85
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-10-089-440/+424
| |\
| * | Revert "Check that the encrypt input uris are not linked to our own internal ↵Dominik Schürmann2015-10-081-26/+3
| | | | | | | | | | | | | | | | | | | | | | | | storage (OKC-01-010)" Fix was not sufficient This reverts commit b10b14d9bc737edc56af0eec3a14bed5ebf3ea39.
| * | Dont allow encryption of app files via Os methods (OKC-01-010)Dominik Schürmann2015-10-081-3/+73
| | |
* | | viewkeyactivity: ask for passphrase for backup only if key has oneVincent Breitmoser2015-10-091-3/+29
| | |
* | | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0843-673/+593
|\ \ \ | | |/ | |/|
| * | pgpdecryptverify: only use keys for verification which are allowed to sign ↵Vincent Breitmoser2015-10-081-2/+10
| | | | | | | | | | | | (OKC-01-013)
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-10-085-160/+9
| |\|
| | * Remove ShareHelper: Not compat with Android >= 5, reduce code complexityDominik Schürmann2015-10-084-159/+6
| | |
| | * Constant for max number of canonicalized user idsDominik Schürmann2015-10-081-1/+3
| | |
| * | improve tests, get rid of some redundant checksVincent Breitmoser2015-10-081-10/+0
| | |
| * | pgpdecryptverify: get rid of duplicate code path for binary signature ↵Vincent Breitmoser2015-10-083-107/+2
| | | | | | | | | | | | verification
| * | pgpdecryptverify: fix non-onepass signature checkingVincent Breitmoser2015-10-082-1/+3
| | |
| * | pgpsignencrypt: unsupported parameter combinations are a bugVincent Breitmoser2015-10-083-5/+1
| | |
| * | pgpdecryptverify: externalize PgpSignatureCheckerVincent Breitmoser2015-10-082-297/+369
| | |
| * | pgpdecryptverify: move cleartext verification into SignatureCheckerVincent Breitmoser2015-10-081-156/+139
| | |
| * | pgpdecryptverify: refactor signature verification state into ↵Vincent Breitmoser2015-10-082-135/+141
| | | | | | | | | | | | SignatureChecker subclass
| * | pgpdecryptverify: fix one pass signature check, actually use bracketed structureVincent Breitmoser2015-10-073-6/+35
| | |
| * | pgpdecryptverify: refactor signature processingVincent Breitmoser2015-10-063-79/+82
| |/
| * use only primary and mutually bound subkeys for fingerprint verificationVincent Breitmoser2015-10-063-7/+11
| |
| * center wizard buttons for other languagesDominik Schürmann2015-10-0410-21/+21
| |
| * Raise min asymmetric key length for all ciphers to 2048 bitDominik Schürmann2015-10-0416-39/+41
| |
| * Show dialog before sharing logDominik Schürmann2015-10-043-5/+88
| |
* | decrypt: fix broken file saveVincent Breitmoser2015-10-061-2/+2
| |
* | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0111-116/+140
|\|
| * No show key button for RESULT_INVALID_SIGNATURE, CleanupDominik Schürmann2015-09-304-10/+20
| |
| * Cleanup in BaseNfcActivityDominik Schürmann2015-09-301-10/+2
| |
| * Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-307-59/+68
| |
| * Fix crashes with Fluffys PGP appletDominik Schürmann2015-09-304-20/+32
| |
| * Enable YubiKey creationDominik Schürmann2015-09-301-14/+5
| |
| * Full 160 bit for phrase confirm, stuffed with onesDominik Schürmann2015-09-293-15/+25
| |
* | decrypt: revise card layout marginsVincent Breitmoser2015-09-301-16/+18
| |
* | import: special treatment for application/pgp-keysVincent Breitmoser2015-09-302-4/+11
| |
* | import: simplify ImportKeysActivity, don't display search bar for fixed inputVincent Breitmoser2015-09-302-168/+109
| |
* | enc-export: use BackupActivity for backup from ViewKeyActivityVincent Breitmoser2015-09-304-11/+17
| |
* | inputdata: don't attempt mime decode on application/* except octet-streamVincent Breitmoser2015-09-301-1/+1
| |
* | decryptverify: add trivial detection of pgp ascii-armored dataVincent Breitmoser2015-09-301-2/+33
| |
* | enc-export: handle onSaveInstanceState, add nicer layout for landscapeVincent Breitmoser2015-09-294-45/+93
| |
* | enc-export: add "back" button to fail stateVincent Breitmoser2015-09-295-20/+439
| |