aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
* | fix typo in excluder activity nameVincent Breitmoser2015-06-181-1/+1
| |
* | minor code style fixesVincent Breitmoser2015-06-181-1/+3
| |
* | fix small oversight in ToolableViewAnimatorVincent Breitmoser2015-06-181-0/+8
| |
* | 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 branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-1729-473/+398
|\| | | | | | | | | | | | | 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 operationVincent Breitmoser2015-06-171-0/+6
| |
| * instrument: use contrib drawer methods, respect passphrase cacheVincent Breitmoser2015-06-171-0/+8
| |
| * 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
| |
| * 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
| |
| * (minor) layout changesVincent Breitmoser2015-06-171-1/+2
| |
| * add ToolableViewAnimatorVincent Breitmoser2015-06-172-0/+65
| |
| * 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
| | |
| * | some bugfixes for new CryptoOperationFragmentVincent Breitmoser2015-06-113-70/+1
| | |
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-117-21/+18
| |\|
* | | fix status icon alignmentVincent Breitmoser2015-06-141-0/+2
| | |
* | | (minor) layout changesVincent Breitmoser2015-06-132-3/+2
| | |
* | | add ToolableViewAnimatorVincent Breitmoser2015-06-114-9/+78
| | |
* | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-117-21/+18
|\ \ \ | | |/ | |/|
| * | Fix debug/release build separationDominik Schürmann2015-06-112-4/+4
| | |
| * | Temporary fix for testDebugDominik Schürmann2015-06-101-4/+2
| | |
| * | Use authority res stringsDominik Schürmann2015-06-101-5/+2
| | |
| * | Allow debug build besides release buildDominik Schürmann2015-06-107-15/+17
| | |
* | | multi-decrypt: switch to cardviewVincent Breitmoser2015-06-101-9/+15
| | |
* | | fix progress for decryptVincent Breitmoser2015-06-103-14/+37
| | |
* | | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-1021-253/+269
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
| * | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-1019-244/+237
| | |
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-103-5/+32
| |\|
| | * Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | |
| | * Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | |
| | * Explicit mention of dependency on 3rd party toolStéphane Lavergne2015-06-081-1/+4
| | | | | | | | | I had the darnest time remembering my old APG days where something was said in passing about, unlike any other application I know, the need here for OI File Manager (or others, later on) to be able to select local files. I'm sure I'm not the only person who could benefit from this reminder. :)
| | * 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-0720-557/+499
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
| * | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-0621-667/+517
| |/