Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | minor code style fixes | Vincent Breitmoser | 2015-06-18 | 1 | -1/+3 | |
| | | ||||||
* | | fix small oversight in ToolableViewAnimator | Vincent Breitmoser | 2015-06-18 | 1 | -0/+8 | |
| | | ||||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 9 | -80/+102 | |
|\| | ||||||
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 7 | -65/+79 | |
| | | ||||||
| * | fix a couple of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 2 | -15/+23 | |
| | | ||||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 42 | -475/+2576 | |
|\| | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |||||
| * | fix filesize reporting in decrypt operation | Vincent Breitmoser | 2015-06-17 | 1 | -0/+6 | |
| | | ||||||
| * | workaround for coverage bug (for now!) | Vincent Breitmoser | 2015-06-17 | 1 | -0/+29 | |
| | | | | | | | | see android bug report https://code.google.com/p/android/issues/detail?id=170607 | |||||
| * | instrument: license stuff | Vincent Breitmoser | 2015-06-17 | 9 | -7/+93 | |
| | | ||||||
| * | instrument: import public keys as public | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 | |
| | | ||||||
| * | instrument: test EncryptKeyCompletionView | Vincent Breitmoser | 2015-06-17 | 3 | -4/+115 | |
| | | ||||||
| * | instrument: use contrib drawer methods, respect passphrase cache | Vincent Breitmoser | 2015-06-17 | 4 | -45/+40 | |
| | | ||||||
| * | work on asymmetric operation instrumentation tests | Vincent Breitmoser | 2015-06-17 | 2 | -101/+233 | |
| | | ||||||
| * | some cleanup in instrumentation tests | Vincent Breitmoser | 2015-06-17 | 2 | -15/+1 | |
| | | ||||||
| * | nicer preview of decrypt_text_fragment layout | Vincent Breitmoser | 2015-06-17 | 1 | -0/+3 | |
| | | ||||||
| * | fix nullpointer in ViewKeyFragment | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 | |
| | | ||||||
| * | fix returned text of cleartext verify | Vincent Breitmoser | 2015-06-17 | 1 | -4/+5 | |
| | | ||||||
| * | use KeyAdapter in KeySpinner | Vincent Breitmoser | 2015-06-17 | 10 | -259/+146 | |
| | | ||||||
| * | improve preview of ViewKeyActivity layout | Vincent Breitmoser | 2015-06-17 | 1 | -1/+10 | |
| | | ||||||
| * | fix symmetric text decryption | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 | |
| | | ||||||
| * | instrument: finish symmetric text encryption test | Vincent Breitmoser | 2015-06-17 | 4 | -4/+156 | |
| | | ||||||
| * | preliminary EditKeyTest | Vincent Breitmoser | 2015-06-17 | 2 | -1/+87 | |
| | | ||||||
| * | clean up helper code, add withKeyItemId matcher for KeyListAdapter | Vincent Breitmoser | 2015-06-17 | 6 | -101/+105 | |
| | | ||||||
| * | return actual last log entry, including from sublogentryparcels | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 | |
| | | ||||||
| * | fix recursive log in modifySecretKeyRing | Vincent Breitmoser | 2015-06-17 | 2 | -8/+3 | |
| | | ||||||
| * | instrument: change handling in PassphraseDialogActivity to work with espresso | Vincent Breitmoser | 2015-06-17 | 2 | -78/+38 | |
| | | ||||||
| * | instrument: work on instrumentation tests | Vincent Breitmoser | 2015-06-17 | 5 | -163/+269 | |
| | | ||||||
| * | instrument: add test for symmetric text encrypt/decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -0/+124 | |
| | | ||||||
| * | instrument: add helper for snackbar check (2) | Vincent Breitmoser | 2015-06-17 | 1 | -0/+31 | |
| | | ||||||
| * | add extra to disregard first-time dialog to main activity | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 | |
| | | ||||||
| * | instrument: add helper method for snackbar checking | Vincent Breitmoser | 2015-06-17 | 2 | -16/+34 | |
| | | ||||||
| * | stash away stuff | Vincent Breitmoser | 2015-06-17 | 3 | -0/+1303 | |
| | | ||||||
| * | update instrumentation test to JUnit4 | Vincent Breitmoser | 2015-06-17 | 1 | -1/+9 | |
| | | ||||||
| * | (minor) layout changes | Vincent Breitmoser | 2015-06-17 | 1 | -1/+2 | |
| | | ||||||
| * | fix instrumentation test(s) | Vincent Breitmoser | 2015-06-17 | 1 | -10/+13 | |
| | | ||||||
| * | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-17 | 2 | -0/+65 | |
| | | ||||||
| * | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 3 | -23/+169 | |
| |\ | | | | | | | Improved smart card error handling | |||||
| | * | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 2 | -50/+51 | |
| | | | ||||||
| | * | Improved smart card error handling | Joey Castillo | 2015-06-10 | 3 | -23/+168 | |
| | | | ||||||
| * | | some bugfixes for new CryptoOperationFragment | Vincent Breitmoser | 2015-06-11 | 3 | -70/+1 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 138 | -21/+5979 | |
| |\| | ||||||
* | | | fix status icon alignment | Vincent Breitmoser | 2015-06-14 | 1 | -0/+2 | |
| | | | ||||||
* | | | (minor) layout changes | Vincent Breitmoser | 2015-06-13 | 2 | -3/+2 | |
| | | | ||||||
* | | | fix instrumentation test(s) | Vincent Breitmoser | 2015-06-13 | 1 | -10/+13 | |
| | | | ||||||
* | | | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-11 | 4 | -9/+78 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 138 | -21/+5991 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Add missing WorkaroundBuildConfig | Dominik Schürmann | 2015-06-11 | 1 | -0/+14 | |
| | | | ||||||
| * | | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 15 | -17/+30 | |
| | | | ||||||
| * | | Use new officially supported way for local unit tests, many dependencies ↵ | Dominik Schürmann | 2015-06-11 | 125 | -0/+5934 | |
| | | | | | | | | | | | | upgraded for this, temporary disabled separate debug builds | |||||
| * | | Temporary fix for testDebug | Dominik Schürmann | 2015-06-10 | 1 | -4/+2 | |
| | | |