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 | 8 | -80/+101 |
|\ | |||||
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 6 | -65/+78 |
| | | |||||
| * | 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 | 24 | -415/+355 |
|\| | | | | | | | | | | | | | 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 |
| | | |||||
| * | instrument: use contrib drawer methods, respect passphrase cache | Vincent Breitmoser | 2015-06-17 | 1 | -0/+8 |
| | | |||||
| * | 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 | 8 | -202/+127 |
| | | |||||
| * | fix symmetric text decryption | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 |
| | | |||||
| * | preliminary EditKeyTest | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 |
| | | |||||
| * | 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 | 1 | -76/+32 |
| | | |||||
| * | instrument: work on instrumentation tests | Vincent Breitmoser | 2015-06-17 | 1 | -1/+0 |
| | | |||||
| * | 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 | 1 | -16/+7 |
| | | |||||
| * | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-17 | 1 | -0/+61 |
| | | |||||
| * | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 2 | -23/+158 |
| |\ | | | | | | | Improved smart card error handling | ||||
| | * | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 1 | -42/+40 |
| | | | |||||
| | * | Improved smart card error handling | Joey Castillo | 2015-06-10 | 2 | -23/+160 |
| | | | |||||
| * | | 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 | 4 | -8/+10 |
| |\| | |||||
* | | | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-11 | 2 | -0/+62 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 4 | -8/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 1 | -2/+2 |
| | | | |||||
| * | | Allow debug build besides release build | Dominik Schürmann | 2015-06-10 | 4 | -8/+10 |
| | | | |||||
* | | | fix progress for decrypt | Vincent Breitmoser | 2015-06-10 | 3 | -14/+37 |
| | | | |||||
* | | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 20 | -252/+265 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | ||||
| * | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 19 | -244/+237 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-10 | 2 | -4/+28 |
| |\| | |||||
| | * | select correct item in drawer on backstack change in main activity | Vincent Breitmoser | 2015-06-08 | 1 | -1/+25 |
| | | | |||||
| | * | prevent null fragments on activity death | Adithya Abraham Philip | 2015-06-03 | 1 | -3/+3 |
| | | | |||||
* | | | multi-decrypt: fix progress with new CryptoFragment interfaces | Vincent Breitmoser | 2015-06-07 | 2 | -139/+73 |
| | | | |||||
* | | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 18 | -557/+495 |
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java | ||||
| * | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 19 | -667/+513 |
| |/ | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 36 | -1376/+1379 |
|\| | | | | | | | | | | | | | | | | | 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 Breitmoser | 2015-06-03 | 6 | -32/+199 |
| |\ | |||||
| | * | keep prefernces individual per dialog (affects only compression) | Vincent Breitmoser | 2015-06-03 | 4 | -10/+22 |
| | | | |||||
| | * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 6 | -32/+187 |
| | | | |||||
| * | | Partially revert "switch to native DialogFragment, fix some nullpointers", ↵ | Vincent Breitmoser | 2015-06-03 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 < 5 | Vincent Breitmoser | 2015-06-03 | 1 | -6/+11 |
| | | | |||||
| * | | Fix comments in service | Dominik Schürmann | 2015-06-01 | 1 | -8/+8 |
| | | | |||||
| * | | corrected indentation | Adithya Abraham Philip | 2015-06-01 | 1 | -271/+278 |
| | | | |||||
| * | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 27 | -197/+195 |
| | | | |||||
| * | | merged services | Adithya Abraham Philip | 2015-06-01 | 25 | -581/+396 |
| | | | |||||
| * | | Merge pull request #1317 from adithyaphilip/master | Dominik Schürmann | 2015-06-01 | 2 | -12/+12 |
| |\ \ | | | | | | | | | Merge key from Keyserver with that from Keybase instead of replacing | ||||
| | * | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 2 | -12/+12 |
| | |/ |