aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-201-2/+3
|\
| * Upload key workingDominik Schürmann2014-08-201-2/+3
| |
* | move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-201-1/+49
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-3/+10
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-201-3/+10
| |
* | Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-201-2/+0
|/
* consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-191-10/+3
|
* consolidate: working implementation, lacking uiVincent Breitmoser2014-08-171-0/+15
|
* parametrize FileImportCache for filenameVincent Breitmoser2014-08-171-1/+1
|
* Always return a SaveKeyringResult from savingDominik Schürmann2014-08-161-1/+6
|
* Fix encrypt onlyDominik Schürmann2014-08-161-15/+19
|
* handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-8/+22
|
* Remove support for v3 sig generationDominik Schürmann2014-08-141-1/+0
|
* 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-131-6/+14
|
* Decrypt metadata apiDominik Schürmann2014-08-111-1/+1
|
* Get original filename for decryptionDominik Schürmann2014-08-111-8/+73
|
* Optimize importsDominik Schürmann2014-08-051-4/+1
|
* Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-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-311-40/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-16/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| * | | | | 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)
* | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-011-3/+7
| |_|_|_|/ |/| | | |
* | | | | 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
* | | rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-9/+9
| | |
* | | return values for create keyDominik Schürmann2014-07-301-4/+2
| | |
* | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-22/+28
| | |
* | | some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-1/+2
| | |
* | | Fallback if no primary user id existsDominik Schürmann2014-07-161-1/+1
| | |
* | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-151-2/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-151-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | Implemented Notification, no fallback yetDaniel Albert2014-07-121-1/+2
| | |/ | |/|
* / | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-111-2/+2
|/ /
* | merge KeychainIntentServiceDominik Schürmann2014-07-021-17/+29
|\ \
| * | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-291-16/+28
| |/
* / remove init methods from adapterDominik Schürmann2014-07-021-0/+1
|/
* Merge branch 'master' into improve-filemar-v-in2014-06-181-140/+30
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-181-4/+3
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 23:11:54 +0000