aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Vincent Breitmoser2015-06-202-48/+73
| | | | loading in decrypt list
* 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
|\| | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * 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
| |\ | | | | | | Improved smart card error handling
| | * 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
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
| * | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-1014-140/+124
| | |
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-102-4/+28
| |\|
| | * select correct item in drawer on backstack change in main activityVincent Breitmoser2015-06-081-1/+25
| | |
| | * prevent null fragments on activity deathAdithya Abraham Philip2015-06-031-3/+3
| | |
* | | multi-decrypt: fix progress with new CryptoFragment interfacesVincent Breitmoser2015-06-072-139/+73
| | |
* | | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-078-453/+312
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
| * | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-069-563/+330
| |/
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-0624-320/+407
|\| | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml
| * Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-034-32/+153
| |\
| | * keep prefernces individual per dialog (affects only compression)Vincent Breitmoser2015-06-032-5/+4
| | |
| | * implement sticky preferencesVincent Breitmoser2015-05-314-32/+154
| | |
| * | Partially revert "switch to native DialogFragment, fix some nullpointers", ↵Vincent Breitmoser2015-06-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | but keep nullpointer fixes This reverts commit 403f74f55830dcc5eaa027ccebb888a1122992d1. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
| * | hide invoke nfc button in android < 5Vincent Breitmoser2015-06-031-6/+11
| | |
| * | renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-0121-170/+168
| | |
| * | merged servicesAdithya Abraham Philip2015-06-0120-129/+87
| | |