aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-0212-152/+216
| | | | | |
| * | | | | Add temporary file storage as discussed in #665mar-v-in2014-07-015-0/+201
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Missing import after mergemar-v-in2014-07-011-0/+1
| | | | | |
| * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-01121-630/+2186
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2421-86/+587
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-2249-526/+997
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more
| * | | | | | | | Improve file more, Part 1mar-v-in2014-06-2215-496/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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)
* | | | | | | | | small fix for MSG_MF_UID_ADD log entryVincent Breitmoser2014-08-011-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-0114-147/+259
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix dumb mistake in modifySecretKeyVincent Breitmoser2014-08-013-16/+10
| | | | | | | | | |
| * | | | | | | | | remove debug output about security providers (cleaner unit tests)Vincent Breitmoser2014-08-011-0/+2
| | | | | | | | | |
| * | | | | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-014-31/+89
| | | | | | | | | |
| * | | | | | | | | move classes around a bitVincent Breitmoser2014-08-018-126/+184
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Again update submodulesDominik Schürmann2014-08-013-0/+0
| | | | | | | | |
* | | | | | | | | Add user id with dialogDominik Schürmann2014-08-0118-228/+455
|/ / / / / / / /
* | | | | | | | Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
| | | | | | | |
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-013-15/+72
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| * | | | | | | | Merge pull request #727 from mar-v-in/fix-cachedpublickeyringDominik Schürmann2014-08-012-12/+58
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | Fix CachedPublicKeyring
| | * | | | | | | Fix CachedPublicKeyringmar-v-in2014-08-012-12/+58
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | I had this code already in my git, but it was in between the load of other things in there, just pulled it out.
* / / / / / / / identity instead of credentialsDominik Schürmann2014-08-011-1/+1
|/ / / / / / /
* | | | | | | Start fixing CachedPublicKeyRingDominik Schürmann2014-08-013-23/+26
| | | | | | |
* | | | | | | Certifying instead of signingDominik Schürmann2014-08-012-7/+7
| | | | | | |
* | | | | | | Remove runtime check to fix passphrase serviceDominik Schürmann2014-08-011-6/+0
| | | | | | |
* | | | | | | Use darker colorsDominik Schürmann2014-08-013-9/+9
| | | | | | |
* | | | | | | Show file tab only for import of existing keysDominik Schürmann2014-08-011-15/+42
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-318-53/+92
|\ \ \ \ \ \ \
| * | | | | | | lowercase all key ids from keyserverVincent Breitmoser2014-07-311-2/+2
| | | | | | | |
| * | | | | | | move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-317-51/+90
| | | | | | | |
* | | | | | | | Show revoked and expired for private keysDominik Schürmann2014-07-311-29/+28
|/ / / / / / /
* | | | | | | Fix update from keyserverDominik Schürmann2014-07-311-0/+5
| | | | | | |
* | | | | | | Remove private/secret key language from stringsDominik Schürmann2014-07-311-9/+5
| | | | | | |
* | | | | | | Fixes for uploadDominik Schürmann2014-07-314-15/+20
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-315-46/+43
|\ \ \ \ \ \ \
| * | | | | | | fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-313-25/+21
| | | | | | | |
| * | | | | | | more fixes on canonicalization and progressVincent Breitmoser2014-07-312-21/+22
| |/ / / / / /
* / / / / / / Create key: design fixesDominik Schürmann2014-07-319-23/+52
|/ / / / / /
* | | | | | Fix animations in create keyDominik Schürmann2014-07-315-47/+31
| | | | | |
* | | | | | Add notify layouts to some activitiesDominik Schürmann2014-07-314-80/+104
| | | | | |
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-314-19/+99
|\ \ \ \ \ \
| * | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵Vincent Breitmoser2014-07-314-19/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | methods
* | | | | | | Robots like coffee too...Dominik Schürmann2014-07-3117-36/+163
|/ / / / / /
* | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ↵Dominik Schürmann2014-07-313-16/+128
| | | | | | | | | | | | | | | | | | | | | | | | file, fix #592
* | | | | | avoid nullpointerexception in EditKeyResultVincent Breitmoser2014-07-311-2/+2
| | | | | |
* | | | | | fix fromStream method, properly recognize multiple concatenated streamsVincent Breitmoser2014-07-311-17/+20
| | | | | |
* | | | | | always return an EditKeyResult in modifyKey methodVincent Breitmoser2014-07-311-25/+25
| | | | | |
* | | | | | tests: adapt to new EditKeyResult return valueVincent Breitmoser2014-07-317-397/+98
| | | | | |
* | | | | | Handle result in create keyDominik Schürmann2014-07-311-2/+7
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 20:54:42 +0000