aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
* preliminary EditKeyTestVincent Breitmoser2015-06-172-1/+87
* clean up helper code, add withKeyItemId matcher for KeyListAdapterVincent Breitmoser2015-06-176-101/+105
* 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-172-78/+38
* instrument: work on instrumentation testsVincent Breitmoser2015-06-175-163/+269
* instrument: add test for symmetric text encrypt/decryptVincent Breitmoser2015-06-171-0/+124
* instrument: add helper for snackbar check (2)Vincent Breitmoser2015-06-171-0/+31
* add extra to disregard first-time dialog to main activityVincent Breitmoser2015-06-171-1/+3
* instrument: add helper method for snackbar checkingVincent Breitmoser2015-06-172-16/+34
* stash away stuffVincent Breitmoser2015-06-173-0/+1303
* update instrumentation test to JUnit4Vincent Breitmoser2015-06-171-1/+9
* (minor) layout changesVincent Breitmoser2015-06-171-1/+2
* fix instrumentation test(s)Vincent Breitmoser2015-06-171-10/+13
* add ToolableViewAnimatorVincent Breitmoser2015-06-172-0/+65
* Merge pull request #1338 from josecastillo/developmentVincent2015-06-123-23/+169
|\
| * 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-11138-21/+5979
|\|
| * Add missing WorkaroundBuildConfigDominik Schürmann2015-06-111-0/+14
| * Fix debug/release build separationDominik Schürmann2015-06-1115-17/+30
| * Use new officially supported way for local unit tests, many dependencies upgr...Dominik Schürmann2015-06-11125-0/+5934
| * 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-1012-15/+17
* | 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
| * 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
* | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-0621-667/+517
|/
* Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-037-32/+207
|\
| * keep prefernces individual per dialog (affects only compression)Vincent Breitmoser2015-06-034-10/+22
| * implement sticky preferencesVincent Breitmoser2015-05-317-32/+195
* | 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-0128-198/+196
* | merged servicesAdithya Abraham Philip2015-06-0125-581/+396
* | Merge pull request #1317 from adithyaphilip/masterDominik Schürmann2015-06-013-12/+13
|\ \
| * | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-313-12/+13
| |/
* | switch to native DialogFragment, fix some nullpointersVincent Breitmoser2015-05-312-22/+26
* | revert some accidentally committed cruftVincent Breitmoser2015-05-311-8/+0
* | handle empty passphrases in PassphraseDialogActivityVincent Breitmoser2015-05-312-0/+34
|/
* prevent NaN dialog on import with no selected keysAdithya Abraham Philip2015-05-312-3/+8
* only promote subkeys which are actually presentVincent Breitmoser2015-05-301-8/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:41:33 +0000