aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-133-14/+31
|
* remove bundle for symmetric/asymmetric fragment as it was uselessmar-v-in2014-08-132-31/+16
|
* fix message and uri from encrypt intentmar-v-in2014-08-132-18/+4
|
* Only show relevant keys in encrypt, fix #756 #757mar-v-in2014-08-122-13/+27
|
* Only show keyrings that have a valid sign key in from field, fixes #756mar-v-in2014-08-121-10/+2
|
* Support mime type in metadataDominik Schürmann2014-08-111-1/+0
|
* Get original filename for decryptionDominik Schürmann2014-08-112-10/+94
|
* Fix compression setting for encryption of filesDominik Schürmann2014-08-101-4/+7
|
* Edit key: prevent the combination of change to primary user id and revocationDominik Schürmann2014-08-071-0/+4
|
* 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