aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-0644-2624/+1895
|\ | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-8/+9
| |
| * Optimize importsDominik Schürmann2014-08-0523-30/+16
| |
| * Increase maximum custom RSA sizeDominik Schürmann2014-08-051-1/+1
| |
| * Edit key: key flagsDominik Schürmann2014-08-054-15/+26
| |
| * Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵Dominik Schürmann2014-08-056-53/+87
| | | | | | | | selection for adding new subkeys
| * More work on add subkey dialog designDominik Schürmann2014-08-051-3/+6
| |
| * Work on add subkey dialog designDominik Schürmann2014-08-053-13/+39
| |
| * Better handling of user id revocation in UI codeDominik Schürmann2014-08-053-19/+70
| |
| * Create key: make single user id primary user id, other cleanupDominik Schürmann2014-08-052-6/+6
| |
| * Refactor expiry dialogDominik Schürmann2014-08-054-221/+224
| |
| * KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-055-13/+32
| |
| * Add license headersDominik Schürmann2014-08-042-0/+34
| |
| * Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
| |
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-042-3/+4
| |
| * More cleanupDominik Schürmann2014-08-041-3/+4
| |
| * Even more smaller nitpicksDominik Schürmann2014-08-041-12/+23
| |
| * Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-044-10/+82
| |
| * Fix debug backup/restore methodsDominik Schürmann2014-08-041-6/+6
| |
| * Remove old edit key stuffDominik Schürmann2014-08-043-1066/+0
| |
| * Edit key: subkey adding, not finishedDominik Schürmann2014-08-048-325/+123
| |
| * button language in encryptDominik Schürmann2014-08-041-1/+0
| |
| * Smaller UI fixesDominik Schürmann2014-08-043-1/+10
| |
| * Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0416-941/+1220
| |\ | | | | | | Improve file encrypt
| | * Minor cleanupmar-v-in2014-08-022-2/+1
| | |
| | * Fix focusing with To fieldmar-v-in2014-08-022-3/+18
| | |
| | * Encrypt UI (drop downs)mar-v-in2014-08-014-21/+40
| | |
| | * Cache input file thumbnail.mar-v-in2014-08-011-3/+20
| | |
| | * Fix first key is not used erroneouslymar-v-in2014-08-011-1/+0
| | |
| | * Fixes after mergemar-v-in2014-08-011-2/+5
| | |
| | * Merge branch 'master' into improve-file-moremar-v-in2014-08-0111-132/+171
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| | * | Fix string resourcesmar-v-in2014-07-311-1/+1
| | | |
| | * | Fix mergemar-v-in2014-07-313-37/+19
| | | |
| | * | Merge branch 'master' into improve-file-moremar-v-in2014-07-3131-1706/+1688
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 multi select for storage api (kitkat)mar-v-in2014-07-318-86/+95
| | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring
| | * | | Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
| | | | |
| | * | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-207-557/+541
| | | | |
| | * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0623-1314/+1608
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Many changes to file ... and still incompletemar-v-in2014-07-066-98/+524
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI
| | * | | | Encrypt/Decrypt UI workmar-v-in2014-07-027-66/+99
| | | | | |
| | * | | | Missing import after mergemar-v-in2014-07-011-0/+1
| | | | | |
| | * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0128-260/+907
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-248-54/+461
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-2215-79/+495
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more
| | * | | | | | | Improve file more, Part 1mar-v-in2014-06-229-379/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-018-157/+368
|\| | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-011-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-011-2/+2
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * / | | | | | | Add user id with dialogDominik Schürmann2014-08-017-155/+366
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-0130-1421/+1226
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 21:51:21 +0000