aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-262-2/+94
|\
| * use KeyAdapter for AllowedKeysListFragmentVincent Breitmoser2015-06-262-2/+94
* | fix: save fileVincent Breitmoser2015-06-231-5/+5
* | fix original file deletion (and instrumentation)Vincent Breitmoser2015-06-231-6/+21
* | implement deletion of filesVincent Breitmoser2015-06-231-4/+17
* | implement saving of filesVincent Breitmoser2015-06-231-2/+23
* | instrument: adapt to new decrypt file dialog, and some minor fixesVincent Breitmoser2015-06-233-8/+6
* | move select file logic into EncryptDecryptOverviewFragmentVincent Breitmoser2015-06-223-195/+50
* | don't expose dataset for FileAdapter in encrypt view, small improvements to e...Vincent Breitmoser2015-06-222-27/+35
* | multi-decrypt: use indeterminate progress onlyVincent Breitmoser2015-06-221-4/+3
* | instrument: some updates to asymmetric decrypt testsVincent Breitmoser2015-06-222-7/+7
* | add failure state to DecryptListFragmentVincent Breitmoser2015-06-221-56/+91
* | add extra for initial fragment in MainActivityVincent Breitmoser2015-06-221-6/+20
* | update keychain intents submodule (for travis)Vincent Breitmoser2015-06-201-1/+1
* | don't show "delete original file" for non-file input urisVincent Breitmoser2015-06-201-6/+4
* | fix display of signed-only contentVincent Breitmoser2015-06-201-4/+7
* | instrument: update symmetric testsVincent Breitmoser2015-06-202-2/+3
* | fix decrypt view intents, save mimetype in storage provider, and thumbnail lo...Vincent Breitmoser2015-06-202-48/+73
* | use uris for clipboard data if available in DecryptActivityVincent Breitmoser2015-06-202-9/+23
* | drop clipboard backwards compatibility for api level < 11Vincent Breitmoser2015-06-201-26/+52
* | allow encrypting to clipboard in EncryptFileFragmentVincent Breitmoser2015-06-201-16/+39
* | extract readTextFromUri into FileHelperVincent Breitmoser2015-06-201-32/+3
* | more work on decrypt fragment uxVincent Breitmoser2015-06-203-104/+123
* | working DisplayTextActivity, more input support in DecryptActivityVincent Breitmoser2015-06-208-231/+153
* | handle empty filename in decrypt listVincent Breitmoser2015-06-191-1/+5
* | handle EXTRA_TEXT in decrypt activityVincent Breitmoser2015-06-191-21/+58
* | save instance state in DecryptListFragmentVincent Breitmoser2015-06-191-26/+83
* | rename activities to match new purposeVincent Breitmoser2015-06-186-16/+21
* | fix ToolableViewAnimator (againl)Vincent Breitmoser2015-06-181-1/+8
* | handle multiple input URIs and Intent.SEND_MULTIPLEVincent Breitmoser2015-06-184-42/+91
* | fix typo in excluder activity nameVincent Breitmoser2015-06-181-1/+1
* | fix small oversight in ToolableViewAnimatorVincent Breitmoser2015-06-181-0/+8
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-173-54/+56
|\|
| * fix rest of resource leaks (#1351)Vincent Breitmoser2015-06-173-54/+56
* | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-1717-391/+328
|\|
| * fix nullpointer in ViewKeyFragmentVincent Breitmoser2015-06-171-1/+1
| * use KeyAdapter in KeySpinnerVincent Breitmoser2015-06-177-202/+123
| * fix symmetric text decryptionVincent Breitmoser2015-06-171-1/+3
| * instrument: change handling in PassphraseDialogActivity to work with espressoVincent Breitmoser2015-06-171-76/+32
| * instrument: work on instrumentation testsVincent Breitmoser2015-06-171-1/+0
| * add extra to disregard first-time dialog to main activityVincent Breitmoser2015-06-171-1/+3
| * instrument: add helper method for snackbar checkingVincent Breitmoser2015-06-171-16/+7
| * add ToolableViewAnimatorVincent Breitmoser2015-06-171-0/+61
| * Merge pull request #1338 from josecastillo/developmentVincent2015-06-122-23/+158
| |\
| | * Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-111-42/+40
| | * Improved smart card error handlingJoey Castillo2015-06-102-23/+160
| * | some bugfixes for new CryptoOperationFragmentVincent Breitmoser2015-06-113-70/+1
* | | add ToolableViewAnimatorVincent Breitmoser2015-06-112-0/+62
* | | fix progress for decryptVincent Breitmoser2015-06-102-7/+14
* | | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-1015-148/+152
|\| |