aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix encrypt onlyDominik Schürmann2014-08-162-18/+22
| |
| * fix keys with no expiry in ui codeVincent Breitmoser2014-08-141-2/+7
| |
| * Pass through of master key id in SaveKeyringResultDominik Schürmann2014-08-141-4/+33
| |
| * handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-8/+22
| |
| * move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-1/+1
| |
| * Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-0/+1
| |
| * Remove support for v3 sig generationDominik Schürmann2014-08-141-1/+0
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-142-55/+144
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
| * Dont write version header by defaultDominik Schürmann2014-08-141-1/+1
| |
| * Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-132-49/+72
| |
| * Decrypt metadata apiDominik Schürmann2014-08-111-1/+1
| |
| * Get original filename for decryptionDominik Schürmann2014-08-111-8/+73
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-067-81/+200
|\| | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle
| * Optimize importsDominik Schürmann2014-08-055-10/+10
| |
| * Create key: make single user id primary user id, other cleanupDominik Schürmann2014-08-051-0/+1
| |
| * Refactor expiry dialogDominik Schürmann2014-08-051-5/+67
| |
| * Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-08-041-2/+2
| |
| * Add license headersDominik Schürmann2014-08-043-0/+51
| |
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-2/+2
| |
| * Remove support for IO_FILE, this is no longer used and was never a good ↵Dominik Schürmann2014-08-041-29/+2
| | | | | | | | practice, use IO_URI on Android!
| * Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-041-40/+72
| |\ | | | | | | Improve file encrypt
| | * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-8/+14
| | |\
| | * \ Merge branch 'master' into improve-file-moremar-v-in2014-08-011-0/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| | * \ \ Merge branch 'master' into improve-file-moremar-v-in2014-07-316-124/+414
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into improve-file-moremar-v-in2014-07-065-48/+82
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| | * | | | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
| | | | | | |
| | * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-012-13/+107
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-241-0/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-221-14/+14
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more
| | * | | | | | | | Improve file more, Part 1mar-v-in2014-06-221-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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)
* | | | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-3/+7
|\| | | | | | | | |
| * | | | | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-011-3/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-015-132/+260
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
| * | | | | | | | Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
| | | | | | | | |
| * | | | | | | | Merge pull request #726 from mar-v-in/fix-import-from-serverDominik Schürmann2014-08-011-3/+14
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | Fix import from server
| | * | | | | | | Undo import changesmar-v-in2014-08-011-3/+27
| | | | | | | | |
| | * | | | | | | Fix import from servermar-v-in2014-08-011-30/+17
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was broken since 7bbe869c88c445b087e32a75572cf18efa2165b6 This also keeps the ACTION_IMPORT_KEYRING action stable
| * / | | | | | Fix update from keyserverDominik Schürmann2014-07-311-0/+5
| |/ / / / / /
| * | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵Vincent Breitmoser2014-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | methods
| * | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ↵Dominik Schürmann2014-07-311-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | file, fix #592
| * | | | | | avoid nullpointerexception in EditKeyResultVincent Breitmoser2014-07-311-2/+2
| | | | | | |
| * | | | | | Keyserver exception translateableDominik Schürmann2014-07-311-1/+1
| | | | | | |
| * | | | | | couple of logging fixesVincent Breitmoser2014-07-311-2/+1
| | | | | | |
| * | | | | | rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-313-12/+11
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-301-0/+1
| |\ \ \ \ \ \
| | * | | | | | couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-0/+1
| | | | | | | |
| * | | | | | | Create key: work on uploadDominik Schürmann2014-07-301-0/+9
| |/ / / / / /
| * | | | | | return values for create keyDominik Schürmann2014-07-301-4/+2
| | | | | | |
| * | | | | | Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-294-42/+158
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
| | * | | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-273-26/+69
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 19:03:29 +0000