aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-07-064-192/+55
|\ | | | | | | | | | | | | | | | | 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
| * Use strings in edit keyDominik Schürmann2014-07-031-3/+4
| |
| * fix no passphrase checkDominik Schürmann2014-07-031-1/+3
| |
| * Cache passphrase for editDominik Schürmann2014-07-031-19/+46
| |
| * Work on editDominik Schürmann2014-07-031-5/+3
| |
| * edit key: part 3Dominik Schürmann2014-07-011-165/+0
| |
* | Encrypt/Decrypt UI workmar-v-in2014-07-021-44/+15
| |
* | Missing import after mergemar-v-in2014-07-011-0/+1
| |
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-012-36/+90
|\| | | | | | | | | | | | | | | 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' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-301-30/+87
| |\
| | * new edit key: first version to add user idsDominik Schürmann2014-06-241-30/+87
| | |
| * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-291-4/+3
| |/
* | Merge branch 'master' into improve-file-moremar-v-in2014-06-242-0/+217
|\|
| * new edit key: diff for existing user idsDominik Schürmann2014-06-222-0/+217
| |
* | Improve file more, Part 1mar-v-in2014-06-222-82/+43
|/ | | | | | | | | | | | | | | - 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)
* Delete using Document API (unsafe)mar-v-in2014-06-101-0/+24
|
* Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-101-15/+43
|
* neatness refactoringVincent Breitmoser2014-06-041-1/+1
|
* new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-271-1/+1
|
* wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-211-10/+17
|
* Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-1410-151/+74
|\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml
| * ui: purplize dialog headers (huge hack inside)Vincent Breitmoser2014-05-0810-23/+58
| |
| * Add applications section to helpDominik Schürmann2014-05-071-1/+1
| |
| * Remove code for sharing whole key via qr codeDominik Schürmann2014-05-071-127/+15
| |
* | wrapped-key-ring: more work on passphrase caching and certificationVincent Breitmoser2014-05-041-2/+6
| |
* | wrapped-key-ring: no more pgp imports in PassphraseDialogFragmentVincent Breitmoser2014-05-041-70/+47
|/
* More code cleanupDominik Schürmann2014-04-193-7/+4
|
* Trying a fix for #585Dominik Schürmann2014-04-191-15/+21
|
* Remove unused strings, fix some lint errors, fix some language confusionsDominik Schürmann2014-04-181-0/+2
|
* get rid of PgpKeyHelper.getMasterKeyIdVincent Breitmoser2014-04-171-3/+6
| | | | Closes #575
* NotFoundExceptions for all getGeneric-type methodsVincent Breitmoser2014-04-172-50/+64
|
* stripped support: add has_secret column to keys tableVincent Breitmoser2014-04-161-2/+2
|
* Optimize importsDominik Schürmann2014-04-158-1/+8
|
* Removing remaining uses of Id, closing one of the oldest bugs #9Dominik Schürmann2014-04-142-15/+15
|
* Update license header for 2014Dominik Schürmann2014-04-137-7/+7
|
* Simplify and fix delete key dialogDominik Schürmann2014-04-111-22/+6
|
* Refactor ProviderHelper to be non-static using a constructor based on ↵Dominik Schürmann2014-04-113-8/+10
| | | | context (first commit to get context out of pgp classes)
* split getMasterKeyId for the remaining use casesVincent Breitmoser2014-04-111-2/+2
| | | | Closes #549
* get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredStringVincent Breitmoser2014-04-111-10/+13
|
* Hide keyboard after hiding custom key length fieldDominik Schürmann2014-04-091-1/+9
|
* Merge pull request #539 from gogowitczak/custom-key-length-infoDominik Schürmann2014-04-091-37/+84
|\ | | | | Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions.
| * Modified Spinner values for CreateKeyDialog. Added info for user about ↵gogowitczak2014-04-081-37/+84
| | | | | | | | custom key length restrictions.
* | Use NotFoundException in more placesDominik Schürmann2014-04-081-6/+11
| |
* | Introduce ProviderHelper.NotFoundException, remove dead codeDominik Schürmann2014-04-081-1/+7
|/
* Fixed coding style.gogowitczak2014-04-081-3/+6
|
* Added possibility to enter custom key length. Added key length limitations, ↵gogowitczak2014-04-071-22/+126
| | | | according to issue #102 and SpongyCastle specification.
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-0610-0/+1723
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 06:05:51 +0000