aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
...
* Backup format v2: redesigned backup code fragment with masked edit textDominik Schürmann2016-02-106-1201/+278
* Merge pull request #1708 from open-keychain/performanceVincent2016-02-1014-158/+484
|\
| * Merge branch 'master' into performanceVincent Breitmoser2016-02-1077-283/+389
| |\
| * | performance: add license headers and some documentationVincent Breitmoser2016-02-105-14/+72
| * | performance: use more canonical hashCode implementationVincent Breitmoser2016-02-051-4/+4
| * | performance: avoid expensive getSecretKeyType call, use cached where possibleVincent Breitmoser2016-02-058-145/+152
| * | performance: cache session keys per compatible S2K configurationVincent Breitmoser2016-02-055-6/+266
* | | Better transaction animationTheo Franzén2016-02-1011-203/+183
| |/ |/|
* | Fix EUR symbolDominik Schürmann2016-02-101-8/+8
* | Fix SecurityException on Android 6 due to remove contacts on disabled syncDominik Schürmann2016-02-093-5/+12
* | Add donation fragmentDominik Schürmann2016-02-093-8/+80
* | Remove leftovers from spongycastleDominik Schürmann2016-02-094-6/+4
* | Replace spongycastle with bouncycastleDominik Schürmann2016-02-0967-239/+239
* | delete linked contacts on turning off contact syncAdithya Abraham Philip2016-02-065-8/+36
|/
* Fix number keypad preferenceDominik Schürmann2016-02-041-1/+1
* import: handle FileNotFoundException (fixes #1688)Vincent Breitmoser2016-02-0117-83/+88
* prevent rare KeyserverSyncAdapterService crashAdithya Abraham Philip2016-01-272-10/+26
* Merge pull request #1683 from eighthave/masterDominik Schürmann2016-01-263-0/+115
|\
| * after receiving panic trigger and locking app, remove from historyHans-Christoph Steiner2016-01-133-0/+56
| * respond to generic panic trigger Intent by clearing passphrasesHans-Christoph Steiner2016-01-132-0/+59
* | Merge pull request #1693 from kbsriram/subkey-revocation-fixVincent2016-01-201-12/+33
|\ \
| * | Always revoke subkeys with a revocation signature.KB Sriram2016-01-151-12/+33
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-01-204-1/+202
|\| |
| * | Handle not installed PGP appletTheo Franzén2016-01-154-1/+202
* | | No PendingIntent for RESULT_NO_SIGNATURE, RESULT_INVALID_SIGNATUREDominik Schürmann2016-01-201-7/+20
|/ /
* / Lowercase ttl stringsDominik Schürmann2016-01-141-7/+7
|/
* forgot to commit a file to previous commit (thanks travis)Vincent Breitmoser2016-01-131-0/+10
* add debug option to use dummy backup code (fixes #1675)Vincent Breitmoser2016-01-131-1/+51
* Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpolDominik Schürmann2016-01-132-61/+28
|\
| * Use new version of Nordpol from jcenterPetter Arvidsson2016-01-121-1/+1
| * Use Nordpol for BaseNfcActivityPetter Arvidsson2016-01-122-61/+28
* | Pull from transifexDominik Schürmann2016-01-1334-44/+318
* | fix symmetric decryption with backup code (fixes #1677)Vincent Breitmoser2016-01-131-5/+6
|/
* fix symmetric decryption (fixes #1672)Vincent Breitmoser2016-01-121-2/+2
* Add facebook key import to changelogDominik Schürmann2016-01-121-0/+1
* Pull from transifexDominik Schürmann2016-01-1125-0/+300
* Fix singleTop definitionsDominik Schürmann2016-01-112-25/+9
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-01-111-2/+15
|\
| * Merge pull request #1666 from open-keychain/file-import-fixDominik Schürmann2016-01-111-2/+15
| |\
| | * fixed file import issue due to onResumeFragmentsAdithya Abraham Philip2016-01-091-2/+15
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-01-114-5/+13
|\| |
| * | passphrasecache: update defaults, add "forever" settingVincent Breitmoser2016-01-114-5/+13
* | | Changelog 3.8Dominik Schürmann2016-01-111-0/+12
|/ /
* | keycreate: animate layout when revert button is pushedVincent Breitmoser2016-01-111-1/+2
* | keycreate: add button to revert to default key configurationVincent Breitmoser2016-01-112-42/+116
* | advstart: simplify layout, and give the icon some spaceVincent Breitmoser2016-01-111-11/+10
* | Pull from transifexDominik Schürmann2016-01-1169-714/+2063
* | Move edit key configuration to menuDominik Schürmann2016-01-114-70/+53
* | Error out when editing a stripped keyDominik Schürmann2016-01-111-1/+6
* | Advanced screen, warning fragmentDominik Schürmann2016-01-1110-17/+108