Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove files related to old nav drawer | Dominik Schürmann | 2015-01-29 | 1 | -18/+0 |
| | |||||
* | Refactor DecryptActivity into DecryptOverviewFragment for nav drawer | Dominik Schürmann | 2015-01-29 | 1 | -2/+1 |
| | |||||
* | Move key list logic into fragment, UI fixes for nav drawer | Dominik Schürmann | 2015-01-29 | 1 | -4/+3 |
| | |||||
* | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 1 | -0/+1 |
| | |||||
* | get rid of two consolidate number preferences | Vincent Breitmoser | 2014-10-03 | 1 | -2/+0 |
| | |||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 1 | -0/+1 |
| | |||||
* | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -2/+2 |
| | |||||
* | Fix build | Dominik Schürmann | 2014-09-15 | 1 | -1/+0 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 1 | -0/+2 |
|\ | |||||
| * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 1 | -0/+2 |
| | | |||||
* | | First work on decrypt | Dominik Schürmann | 2014-09-14 | 1 | -0/+1 |
|/ | |||||
* | Make Intent API as recommended in ↵ | Dominik Schürmann | 2014-09-07 | 1 | -0/+3 |
| | | | | http://developer.android.com/guide/components/intents-filters.html | ||||
* | Due to compatiblity switch from SHA512 to SHA256 | Dominik Schürmann | 2014-09-07 | 1 | -2/+2 |
| | |||||
* | More UI rework | Dominik Schürmann | 2014-09-07 | 1 | -2/+2 |
| | |||||
* | Add yubikey default PIN preference | Dominik Schürmann | 2014-09-05 | 1 | -0/+1 |
| | |||||
* | Integrate safeslinger share | Dominik Schürmann | 2014-09-04 | 1 | -1/+3 |
| | |||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 1 | -3/+6 |
| | |||||
* | remember "show advanced tabs" setting | Vincent Breitmoser | 2014-08-31 | 1 | -0/+1 |
| | | | | Closes #669 | ||||
* | Change account type | Dominik Schürmann | 2014-08-21 | 1 | -0/+3 |
| | |||||
* | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -0/+3 |
| | |||||
* | Remove subkeys.pgp.net keyserver from defaults | Dominik Schürmann | 2014-08-15 | 1 | -1/+1 |
| | |||||
* | Remove subkeys.pgp.net keyserver, often down and no hkps | Dominik Schürmann | 2014-08-15 | 1 | -1/+1 |
| | |||||
* | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 |
| | |||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -12/+1 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+0 |
| | |||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 1 | -7/+0 |
| | | | | selection for adding new subkeys | ||||
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -2/+0 |
| | |||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | ||||
| | * | New first time screen | Dominik Schürmann | 2014-07-16 | 1 | -0/+1 |
| | | | |||||
| * | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 1 | -0/+1 |
| |/ | |||||
* | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 1 | -0/+2 |
| | | | | | | | | 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. | ||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java | ||||
| * | Move sks-keyservers.net CA into assets folder | mar-v-in | 2014-06-25 | 1 | -35/+0 |
| | | |||||
| * | Fix sks-keyservers.net sub pool | mar-v-in | 2014-06-24 | 1 | -1/+1 |
| | | |||||
| * | Update Keyservers to use hkps as needed | mar-v-in | 2014-06-24 | 1 | -1/+3 |
| | | |||||
| * | Few fixes on hkps | mar-v-in | 2014-06-23 | 1 | -31/+31 |
| | | | | | | | | TODO: Fix add as well | ||||
| * | Add hkps support for sks-keyservers.net | mar-v-in | 2014-06-23 | 1 | -0/+35 |
| | | |||||
* | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -3/+4 |
|/ | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion) | ||||
* | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -0/+3 |
| | |||||
* | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -0/+2 |
| | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
* | Some comments to Constants | Dominik Schürmann | 2014-04-14 | 1 | -1/+2 |
| | |||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -0/+21 |
| | |||||
* | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 1 | -9/+10 |
| | |||||
* | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 1 | -1/+1 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+82 |