aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-179-80/+102
|\
| * fix rest of resource leaks (#1351)Vincent Breitmoser2015-06-177-65/+79
| |
| * fix a couple of resource leaks (#1351)Vincent Breitmoser2015-06-172-15/+23
| |
| * Merge pull request #1352 from open-keychain/v/instrumentDominik Schürmann2015-06-1744-400/+2567
| |\ | | | | | | instrumentation branch
* | \ Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-1748-489/+2633
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * | use regular runner for most casesVincent Breitmoser2015-06-171-1/+7
| | |
| * | disable instrumentation tests in travis, it's just too slowVincent Breitmoser2015-06-171-11/+13
| | |
| * | just force commit ui test coverageVincent Breitmoser2015-06-171-0/+0
| | |
| * | another shot at travisVincent Breitmoser2015-06-172-10/+40
| | |
| * | fix filesize reporting in decrypt operationVincent Breitmoser2015-06-171-0/+6
| | |
| * | workaround for coverage bug (for now!)Vincent Breitmoser2015-06-172-2/+34
| | | | | | | | | | | | see android bug report https://code.google.com/p/android/issues/detail?id=170607
| * | instrument: license stuffVincent Breitmoser2015-06-179-7/+93
| | |
| * | instrument: import public keys as publicVincent Breitmoser2015-06-171-1/+1
| | |
| * | instrument: test EncryptKeyCompletionViewVincent Breitmoser2015-06-173-4/+115
| | |
| * | instrument: use contrib drawer methods, respect passphrase cacheVincent Breitmoser2015-06-174-45/+40
| | |
| * | work on asymmetric operation instrumentation testsVincent Breitmoser2015-06-172-101/+233
| | |
| * | 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-175-1/+1307
| | |
| * | update instrumentation test to JUnit4Vincent Breitmoser2015-06-172-3/+10
| | |
| * | travis: disable instrumentation for nowVincent Breitmoser2015-06-171-5/+7
| | |
| * | travis: random testingVincent Breitmoser2015-06-171-2/+2
| | |
| * | add instrumentation testsVincent Breitmoser2015-06-171-1/+8
| | |
| * | try travis with android lang typeVincent Breitmoser2015-06-171-15/+17
| | |
| * | (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
| | |
| * | Merge pull request #1331 from open-keychain/v/eventbusVincent2015-06-1234-804/+578
| |\ \ | | | | | | | | replace messenger hack with eventbus
| | * | some bugfixes for new CryptoOperationFragmentVincent Breitmoser2015-06-113-70/+1
| | | |
| | * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-11145-247/+255
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 11:37:58 +0000