aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | some cleanup in instrumentation testsVincent Breitmoser2015-06-172-15/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | nicer preview of decrypt_text_fragment layoutVincent Breitmoser2015-06-171-0/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix nullpointer in ViewKeyFragmentVincent Breitmoser2015-06-171-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix returned text of cleartext verifyVincent Breitmoser2015-06-171-4/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | use KeyAdapter in KeySpinnerVincent Breitmoser2015-06-1710-259/+146
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | improve preview of ViewKeyActivity layoutVincent Breitmoser2015-06-171-1/+10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix symmetric text decryptionVincent Breitmoser2015-06-171-1/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | instrument: finish symmetric text encryption testVincent Breitmoser2015-06-174-4/+156
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | preliminary EditKeyTestVincent Breitmoser2015-06-172-1/+87
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | clean up helper code, add withKeyItemId matcher for KeyListAdapterVincent Breitmoser2015-06-176-101/+105
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | return actual last log entry, including from sublogentryparcelsVincent Breitmoser2015-06-171-1/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix recursive log in modifySecretKeyRingVincent Breitmoser2015-06-172-8/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | instrument: change handling in PassphraseDialogActivity to work with espressoVincent Breitmoser2015-06-172-78/+38
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | instrument: work on instrumentation testsVincent Breitmoser2015-06-175-163/+269
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | instrument: add test for symmetric text encrypt/decryptVincent Breitmoser2015-06-171-0/+124
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | instrument: add helper for snackbar check (2)Vincent Breitmoser2015-06-171-0/+31
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | add extra to disregard first-time dialog to main activityVincent Breitmoser2015-06-171-1/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | instrument: add helper method for snackbar checkingVincent Breitmoser2015-06-172-16/+34
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | stash away stuffVincent Breitmoser2015-06-174-0/+1305
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | update instrumentation test to JUnit4Vincent Breitmoser2015-06-172-3/+10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | (minor) layout changesVincent Breitmoser2015-06-171-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix instrumentation test(s)Vincent Breitmoser2015-06-172-14/+21
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | add ToolableViewAnimatorVincent Breitmoser2015-06-172-0/+65
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Cleanup in build.gradleDominik Schürmann2015-06-161-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1338 from josecastillo/developmentVincent2015-06-123-23/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved smart card error handling
| | * | | | | | | | | | | | | | | Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-112-50/+51
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Improved smart card error handlingJoey Castillo2015-06-103-23/+168
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | some bugfixes for new CryptoOperationFragmentVincent Breitmoser2015-06-113-70/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-11139-24/+6044
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | fix status icon alignmentVincent Breitmoser2015-06-141-0/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | (minor) layout changesVincent Breitmoser2015-06-132-3/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | fix instrumentation test(s)Vincent Breitmoser2015-06-132-14/+21
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | add ToolableViewAnimatorVincent Breitmoser2015-06-114-9/+78
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-11139-24/+6056
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix coverallsDominik Schürmann2015-06-111-0/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Try coveralls supportDominik Schürmann2015-06-111-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Jacoco support for local unit testsDominik Schürmann2015-06-111-1/+32
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove unused deps, fix travisDominik Schürmann2015-06-111-5/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add missing WorkaroundBuildConfigDominik Schürmann2015-06-111-0/+14
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix debug/release build separationDominik Schürmann2015-06-1116-46/+33
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use new officially supported way for local unit tests, many dependencies ↵Dominik Schürmann2015-06-11126-4/+5948
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgraded for this, temporary disabled separate debug builds
| * | | | | | | | | | | | | | | | Temporary fix for testDebugDominik Schürmann2015-06-102-5/+23
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use authority res stringsDominik Schürmann2015-06-101-5/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Allow debug build besides release buildDominik Schürmann2015-06-1013-15/+41
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | multi-decrypt: switch to cardviewVincent Breitmoser2015-06-101-9/+15
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | fix progress for decryptVincent Breitmoser2015-06-103-14/+37
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-1022-254/+269
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
| * | | | | | | | | | | | | | | | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-1020-245/+237
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-103-5/+32
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | | | | | | | | | | | | | | | |