aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog
Commit message (Expand)AuthorAgeFilesLines
* Fix mergemar-v-in2014-07-311-3/+2
* Merge branch 'master' into improve-file-moremar-v-in2014-07-315-150/+403
|\
| * couple of logging fixesVincent Breitmoser2014-07-311-2/+0
| * rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-7/+7
| * Create key: repeat passphraseDominik Schürmann2014-07-301-5/+0
| * Redesigned QR Code viewDominik Schürmann2014-07-271-111/+0
| * Open keyboard on passphrase dialog, this should now work on all Android versi...Dominik Schürmann2014-07-272-27/+92
| * Fallback if no primary user id existsDominik Schürmann2014-07-161-3/+3
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-121-3/+12
| |\
| | * Fixed issues discussed in #713Daniel Albert2014-07-121-2/+2
| | * Implemented Notification, no fallback yetDaniel Albert2014-07-121-3/+12
| * | more work on edit keyDominik Schürmann2014-07-121-0/+187
| |/
| * Work on subkeys adapterDominik Schürmann2014-07-081-0/+110
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-064-192/+55
|\|
| * 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
|\|
| * 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
|/
* 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
|\
| * 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
* 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 context...Dominik Schürmann2014-04-113-8/+10