aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* migrated import to KeychainNewServiceAdithya Abraham Philip2015-06-275-248/+218
* introduced OpHelper for import in DecryptFragmentAdithya Abraham Philip2015-06-271-40/+44
* introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-279-511/+778
* Language: Remember instead of cachingDominik Schürmann2015-06-261-8/+8
* Merge pull request #1324 from open-keychain/v/multi-decryptVincent2015-06-2687-1625/+3819
|\
| * instrument: small fix and up to date coverage.ecVincent Breitmoser2015-06-262-3/+0
| * Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-265-15/+17
| |\ | |/ |/|
* | disable automatic accept for own uid in RemoteService, and fix some warningsVincent Breitmoser2015-06-261-15/+8
* | Merge pull request #1373 from thialfihar/feature/add-debug-app-nameDominik Schürmann2015-06-264-0/+9
|\ \
| * | Make app name reflect debug buildsThialfihar2015-06-261-0/+4
| * | Import R and BuildConfig explicitlyThialfihar2015-06-263-0/+5
|/ /
| * instrument: stash away bitmapmatcher for laterVincent Breitmoser2015-06-261-0/+63
| * Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-2623-197/+460
| |\ | |/ |/|
* | instrument: first couple of tests for OpenPGP APIVincent Breitmoser2015-06-263-1/+188
* | use KeyAdapter for AllowedKeysListFragmentVincent Breitmoser2015-06-264-135/+135
* | fix warnings in PassphraseCacheServiceVincent Breitmoser2015-06-261-13/+25
* | Merge pull request #1367 from open-keychain/fingerprint-mismatchDominik Schürmann2015-06-251-1/+1
|\ \
| * | fixed fingerprint mismatch issueAdithya Abraham Philip2015-06-251-1/+1
|/ /
* | Notification: follow design guidelines, fix #1313Dominik Schürmann2015-06-242-51/+37
* | New notify iconDominik Schürmann2015-06-2414-35/+40
* | Merge pull request #1360 from moparisthebest/masterDominik Schürmann2015-06-2413-5/+78
|\ \
| * | New all-white status bar icon to fix issue #1356moparisthebest2015-06-2213-5/+78
|/ /
| * fix: save fileVincent Breitmoser2015-06-231-5/+5
| * instrument: save fileVincent Breitmoser2015-06-231-2/+43
| * fix original file deletion (and instrumentation)Vincent Breitmoser2015-06-234-11/+29
| * instrument: delete file and inline preference testsVincent Breitmoser2015-06-235-50/+180
| * implement deletion of filesVincent Breitmoser2015-06-2321-28/+45
| * implement saving of filesVincent Breitmoser2015-06-233-2/+56
| * instrument: adapt to new decrypt file dialog, and some minor fixesVincent Breitmoser2015-06-236-14/+35
| * move select file logic into EncryptDecryptOverviewFragmentVincent Breitmoser2015-06-226-227/+63
| * small fix and some cleanup in ServiceProgressFragmentVincent Breitmoser2015-06-221-12/+32
| * instrument: some cleanupVincent Breitmoser2015-06-224-91/+14
| * update instrumentation coverage fileVincent Breitmoser2015-06-221-0/+0
| * instrument: test error handling in asymmetric operationsVincent Breitmoser2015-06-221-0/+45
| * don't expose dataset for FileAdapter in encrypt view, small improvements to e...Vincent Breitmoser2015-06-2220-45/+54
| * order menu items for encrypt operationsVincent Breitmoser2015-06-223-6/+18
| * multi-decrypt: use indeterminate progress onlyVincent Breitmoser2015-06-223-54/+49
| * instrument: restructure some tests, add bad clipboard data testVincent Breitmoser2015-06-227-41/+45
| * instrument: some updates to asymmetric decrypt testsVincent Breitmoser2015-06-2210-14/+624
| * add failure state to DecryptListFragmentVincent Breitmoser2015-06-222-57/+140
| * add extra for initial fragment in MainActivityVincent Breitmoser2015-06-221-6/+20
| * update keychain intents submodule (for travis)Vincent Breitmoser2015-06-202-1/+1
| * update instrumentation coverage fileVincent Breitmoser2015-06-201-0/+0
| * instrument: fix DrawableMatcher for varying contextsVincent Breitmoser2015-06-201-1/+1
| * don't show "delete original file" for non-file input urisVincent Breitmoser2015-06-201-6/+4
| * instrument: check for encrypt/sign status iconsVincent Breitmoser2015-06-202-18/+37
| * fix display of signed-only contentVincent Breitmoser2015-06-201-4/+7
| * instrument: update asymmetric testsVincent Breitmoser2015-06-202-61/+19
| * instrument: update symmetric testsVincent Breitmoser2015-06-206-24/+161
| * fix overflow iconVincent Breitmoser2015-06-204-1/+1