Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleanup of contact sync, debugging | Dominik Schürmann | 2015-03-03 | 1 | -80/+110 |
| | |||||
* | Use index constants in ContactHelper | Dominik Schürmann | 2015-03-02 | 1 | -7/+20 |
| | |||||
* | forgot to commit FabContainer | Vincent Breitmoser | 2015-02-28 | 1 | -0/+8 |
| | |||||
* | Disable default yubikey PIN by default | Dominik Schürmann | 2015-02-22 | 1 | -1/+1 |
| | |||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 3 | -2/+13 |
| | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -1/+0 |
| | |||||
* | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 1 | -3/+3 |
|\ | | | | | | | | | Conflicts: OpenKeychain/build.gradle | ||||
* | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 11 | -64/+35 |
| | | |||||
* | | Disable sharing chooser blacklisting for lollipop | Dominik Schürmann | 2015-01-19 | 1 | -2/+4 |
|/ | |||||
* | Yubikey numkey by default to true | Dominik Schürmann | 2015-01-14 | 1 | -1/+1 |
| | |||||
* | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 1 | -3/+4 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | ||||
* | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 1 | -8/+8 |
| | |||||
* | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 1 | -0/+6 |
| | |||||
* | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 1 | -10/+0 |
| | |||||
* | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 2 | -9/+20 |
| | |||||
* | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 1 | -0/+10 |
| | |||||
* | rewrite export with new operation style | Vincent Breitmoser | 2014-10-13 | 1 | -12/+4 |
| | |||||
* | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 1 | -1/+2 |
| | |||||
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -1/+1 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -1/+1 |
| | |||||
* | Make bit size optional | Dominik Schürmann | 2014-10-05 | 1 | -1/+0 |
| | |||||
* | move IteratorWithSize interface into ParcelableFileCache - much cleaner | Vincent Breitmoser | 2014-10-03 | 1 | -11/+18 |
| | |||||
* | actually use iterator interface for ParcelableFileCache in activities | Vincent Breitmoser | 2014-10-03 | 1 | -1/+5 |
| | |||||
* | get rid of two consolidate number preferences | Vincent Breitmoser | 2014-10-03 | 1 | -20/+0 |
| | |||||
* | use iterator interface exclusively in ParcelableFileCache | Vincent Breitmoser | 2014-10-03 | 1 | -12/+9 |
| | |||||
* | More debugging output | Dominik Schürmann | 2014-10-01 | 1 | -0/+45 |
| | |||||
* | add class for proper nfc tlv packet parsing | Vincent Breitmoser | 2014-09-29 | 1 | -0/+195 |
| | |||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 1 | -0/+10 |
| | |||||
* | Fix custom key configuration for primary user ids | Dominik Schürmann | 2014-09-21 | 1 | -1/+0 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 12 | -202/+1661 |
| | | | | created ui.util for everything related to formatting | ||||
* | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 1 | -0/+53 |
| | | | | non-decodable characters) | ||||
* | Consolidate on database upgrade | Dominik Schürmann | 2014-09-09 | 1 | -3/+10 |
| | |||||
* | ditch NullProgressable | Vincent Breitmoser | 2014-08-30 | 1 | -0/+4 |
| | |||||
* | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -9/+4 |
| | |||||
* | add ProgressFixedScaler (forgot in a previous commit) | Vincent Breitmoser | 2014-08-19 | 1 | -0/+29 |
| | |||||
* | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -1/+21 |
| | |||||
* | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 1 | -5/+6 |
| | |||||
* | Remove MD5 support | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 |
| | |||||
* | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -4/+5 |
| | |||||
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 1 | -0/+36 |
|\ | | | | | Improve file encrypt | ||||
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 2 | -4/+10 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java | ||||
| * | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 1 | -0/+36 |
| | | | | | | | | | | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned. | ||||
* | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -26/+26 |
| | | | |||||
* | | | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 1 | -0/+179 |
| |/ |/| | |||||
* | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| | | | | | | | | methods | ||||
* | | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 1 | -3/+9 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| * | | modifyKey: error out on integrity check fails | Vincent Breitmoser | 2014-07-12 | 1 | -3/+9 |
| |/ | |||||
* / | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 |
|/ | |||||
* | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -121/+0 |
| | |||||
* | Changed license header | Daniel Haß | 2014-06-16 | 1 | -11/+11 |
| |