aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-1724-415/+355
|\
| * fix filesize reporting in decrypt operationVincent Breitmoser2015-06-171-0/+6
| * instrument: use contrib drawer methods, respect passphrase cacheVincent Breitmoser2015-06-171-0/+8
| * 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-178-202/+127
| * fix symmetric text decryptionVincent Breitmoser2015-06-171-1/+3
| * preliminary EditKeyTestVincent Breitmoser2015-06-171-1/+1
| * 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-171-76/+32
| * instrument: work on instrumentation testsVincent Breitmoser2015-06-171-1/+0
| * add extra to disregard first-time dialog to main activityVincent Breitmoser2015-06-171-1/+3
| * instrument: add helper method for snackbar checkingVincent Breitmoser2015-06-171-16/+7
| * add ToolableViewAnimatorVincent Breitmoser2015-06-171-0/+61
| * Merge pull request #1338 from josecastillo/developmentVincent2015-06-122-23/+158
| |\
| | * Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-111-42/+40
| | * Improved smart card error handlingJoey Castillo2015-06-102-23/+160
| * | some bugfixes for new CryptoOperationFragmentVincent Breitmoser2015-06-113-70/+1
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-114-8/+10
| |\|
* | | add ToolableViewAnimatorVincent Breitmoser2015-06-112-0/+62
* | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-114-8/+10
|\ \ \ | | |/ | |/|
| * | Fix debug/release build separationDominik Schürmann2015-06-111-2/+2
| * | Allow debug build besides release buildDominik Schürmann2015-06-104-8/+10
* | | fix progress for decryptVincent Breitmoser2015-06-103-14/+37
* | | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-1020-252/+265
|\ \ \ | | |/ | |/|
| * | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-1019-244/+237
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-102-4/+28
| |\|
| | * select correct item in drawer on backstack change in main activityVincent Breitmoser2015-06-081-1/+25
| | * prevent null fragments on activity deathAdithya Abraham Philip2015-06-031-3/+3
* | | multi-decrypt: fix progress with new CryptoFragment interfacesVincent Breitmoser2015-06-072-139/+73
* | | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-0718-557/+495
|\| |
| * | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-0619-667/+513
| |/
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-0636-1376/+1379
|\|
| * Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-036-32/+199
| |\
| | * keep prefernces individual per dialog (affects only compression)Vincent Breitmoser2015-06-034-10/+22
| | * implement sticky preferencesVincent Breitmoser2015-05-316-32/+187
| * | Partially revert "switch to native DialogFragment, fix some nullpointers", bu...Vincent Breitmoser2015-06-032-3/+6
| * | hide invoke nfc button in android < 5Vincent Breitmoser2015-06-031-6/+11
| * | Fix comments in serviceDominik Schürmann2015-06-011-8/+8
| * | corrected indentationAdithya Abraham Philip2015-06-011-271/+278
| * | renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-0127-197/+195
| * | merged servicesAdithya Abraham Philip2015-06-0125-581/+396
| * | Merge pull request #1317 from adithyaphilip/masterDominik Schürmann2015-06-012-12/+12
| |\ \
| | * | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-312-12/+12
| | |/
* | | multi-decrypt: implement save operation (missing actual copy)Vincent Breitmoser2015-06-032-50/+81
* | | multi-decrypt: working context menuVincent Breitmoser2015-06-031-5/+69
* | | get back to a working stateVincent Breitmoser2015-06-031-3/+5
* | | multi-decrypt: working in principleVincent Breitmoser2015-06-024-54/+375
* | | multi-decrypt: working recyclerview which decrypt files sequentially, ui in p...Vincent Breitmoser2015-06-023-243/+212
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 23:32:38 +0000