Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use KeyAdapter for AllowedKeysListFragment | Vincent Breitmoser | 2015-06-26 | 2 | -2/+94 |
| | |||||
* | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 3 | -54/+56 |
| | |||||
* | fix nullpointer in ViewKeyFragment | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 |
| | |||||
* | use KeyAdapter in KeySpinner | Vincent Breitmoser | 2015-06-17 | 7 | -202/+123 |
| | |||||
* | fix symmetric text decryption | Vincent Breitmoser | 2015-06-17 | 1 | -1/+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 |
| | | |||||
* | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 14 | -140/+124 |
| | | |||||
* | | 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 |
| | | |||||
* | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 9 | -563/+330 |
|/ | |||||
* | Merge branch 'v/sticky-prefs' | Vincent Breitmoser | 2015-06-03 | 4 | -32/+153 |
|\ | |||||
| * | keep prefernces individual per dialog (affects only compression) | Vincent Breitmoser | 2015-06-03 | 2 | -5/+4 |
| | | |||||
| * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 4 | -32/+154 |
| | | |||||
* | | Partially revert "switch to native DialogFragment, fix some nullpointers", ↵ | Vincent Breitmoser | 2015-06-03 | 1 | -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 < 5 | Vincent Breitmoser | 2015-06-03 | 1 | -6/+11 |
| | | |||||
* | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 21 | -170/+168 |
| | | |||||
* | | merged services | Adithya Abraham Philip | 2015-06-01 | 20 | -129/+87 |
| | | |||||
* | | switch to native DialogFragment, fix some nullpointers | Vincent Breitmoser | 2015-05-31 | 1 | -18/+24 |
| | | |||||
* | | revert some accidentally committed cruft | Vincent Breitmoser | 2015-05-31 | 1 | -8/+0 |
| | | |||||
* | | handle empty passphrases in PassphraseDialogActivity | Vincent Breitmoser | 2015-05-31 | 2 | -0/+34 |
|/ | |||||
* | prevent NaN dialog on import with no selected keys | Adithya Abraham Philip | 2015-05-31 | 1 | -3/+7 |
| | |||||
* | some decrypt/verify bug fixes | Vincent Breitmoser | 2015-05-30 | 1 | -2/+1 |
| | |||||
* | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 4 | -16/+12 |
| | |||||
* | show status indicators in EncryptFragment | Vincent Breitmoser | 2015-05-30 | 1 | -0/+33 |
| | |||||
* | rewrite data flow in EncryptFileFragment preserve state correctly | Vincent Breitmoser | 2015-05-30 | 3 | -66/+87 |
| | |||||
* | externalize caching functionality from CertifyKeyFragment | Vincent Breitmoser | 2015-05-30 | 2 | -20/+75 |
| | |||||
* | make KeyItem serializble, for state in TokenTextCompleteView | Vincent Breitmoser | 2015-05-30 | 1 | -1/+3 |
| | |||||
* | preserve state in DecryptFilesActivity/-Fragment | Vincent Breitmoser | 2015-05-29 | 2 | -37/+26 |
| | |||||
* | preserve state in CertifyKeyFragment | Vincent Breitmoser | 2015-05-29 | 2 | -30/+73 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 7 | -38/+85 |
|\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | respect cache in yubikey pin data flow | Vincent Breitmoser | 2015-05-28 | 2 | -6/+21 |
| | | |||||
| * | preserve state in DecryptTextActivity | Vincent Breitmoser | 2015-05-28 | 4 | -25/+55 |
| | | |||||
| * | shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperation | Vincent Breitmoser | 2015-05-28 | 1 | -7/+8 |
| | | |||||
| * | don't keep an activity reference in CreateKeyFinalFragment | Vincent Breitmoser | 2015-05-28 | 1 | -25/+19 |
| | | |||||
| * | correctly preserve state in EncryptTextFragment | Vincent Breitmoser | 2015-05-28 | 1 | -3/+15 |
| | | |||||
| * | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-28 | 2 | -7/+38 |
| | | |||||
| * | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-28 | 3 | -15/+33 |
| | | |||||
| * | preserve state in KeySpinner, and some lint fixes | Vincent Breitmoser | 2015-05-28 | 4 | -20/+46 |
| | | |||||
| * | rewrite EncryptActivity data flow | Vincent Breitmoser | 2015-05-28 | 10 | -477/+346 |
| | | |||||
| * | fix nullpointer in encrypttextactivity. fixes #1267 | Vincent Breitmoser | 2015-05-28 | 1 | -24/+18 |
| | | |||||
| * | highlight currently selected item in navigation drawer | Yoshi64Bit | 2015-05-28 | 1 | -10/+19 |
| | |