aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove spongycastle submoduleDominik Schürmann2016-02-092-4/+0
|
* Merge pull request #1713 from open-keychain/unlink-contactDominik Schürmann2016-02-065-8/+36
|\ | | | | Deletes linked OpenKeychain contacts if sync is disabled
| * 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
|
* Merge pull request #1706 from open-keychain/keyserverservice-fixDominik Schürmann2016-01-302-10/+26
|\ | | | | Prevent Rare KeyserverSyncAdapterService Crash
| * prevent rare KeyserverSyncAdapterService crashAdithya Abraham Philip2016-01-272-10/+26
|/
* Merge pull request #1683 from eighthave/masterDominik Schürmann2016-01-263-0/+115
|\ | | | | allow "panic button" apps to clear all passphrases
| * after receiving panic trigger and locking app, remove from historyHans-Christoph Steiner2016-01-133-0/+56
| | | | | | | | This makes the app fully exit, and removes it from the Recent Apps listing.
| * respond to generic panic trigger Intent by clearing passphrasesHans-Christoph Steiner2016-01-132-0/+59
| | | | | | | | | | | | PanicKit provides a common framework for creating "panic button" apps that can trigger actions in "panic responder" apps. In this case, the response is to clear all the cached passphrases.
* | Merge pull request #1693 from kbsriram/subkey-revocation-fixVincent2016-01-204-12/+310
|\ \ | | | | | | Always revoke subkeys with a revocation signature.
| * | Always revoke subkeys with a revocation signature.KB Sriram2016-01-154-12/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike UID revocations which are "reversible" by newer UID self-signatures, a subkey revocation should be "permanent" even if followed by a newer self-signature. The RFC is ambiguous on this, but this is the convention used by (e.g.) GnuPG. The rationale for this behaviour is available as comments within the GnuPG source. UID signatures: https://github.com/mtigas/gnupg/blob/50c98c7ed6b542857ee2f902eca36cda37407737/g10/getkey.c#L1668-L1674 Subkey signatures: https://github.com/mtigas/gnupg/blob/50c98c7ed6b542857ee2f902eca36cda37407737/g10/getkey.c#L1990-L1997
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-01-204-1/+202
|\| |
| * | Merge pull request #1686 from fidesmo/feature-handle-not-installed-nfc-appletVincent2016-01-154-1/+202
| |\ \ | | | | | | | | Handle not installed PGP applet
| | * | 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-133-61/+34
|\ | | | | Use Nordpol for BaseNfcActivity
| * Use new version of Nordpol from jcenterPetter Arvidsson2016-01-123-6/+5
| | | | | | | | | | - Use version 0.1.13 that is now available on jcenter - Add a "gradle witness" for this version
| * Use Nordpol for BaseNfcActivityPetter Arvidsson2016-01-124-61/+35
| | | | | | | | | | | | | | | | - Replace handling of intents with Nordpol tag dispatcher - Update CreateKeyActivity to pass it's intent to the tag dispatcher when invoked by the system (onCreate) - Add Fidesmo marmeladburk repository - Add dependency on nordpol-android and nordpol-core
* | Version 3.8.2Dominik Schürmann2016-01-131-2/+2
| |
* | Pull from transifexDominik Schürmann2016-01-1334-44/+318
| |
* | fix symmetric decryption with backup code (fixes #1677)Vincent Breitmoser2016-01-131-5/+6
|/
* Version 3.8.1Dominik Schürmann2016-01-121-2/+2
|
* fix symmetric decryption (fixes #1672)Vincent Breitmoser2016-01-121-2/+2
|
* Add facebook key import to changelogDominik Schürmann2016-01-121-0/+1
|
* Version 3.8Dominik Schürmann2016-01-111-2/+2
|
* 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 onResumeFragments
| | * 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
|/ /
* | update build instructions in readmeVincent Breitmoser2016-01-111-4/+4
| |
* | 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
| |
* | Remove old screenshots, move api demo screenshotsDominik Schürmann2016-01-118-0/+0
| |
* | 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
| |
* | Add transifex advanced resourceDominik Schürmann2016-01-111-0/+5
| |
* | Advanced screen, warning fragmentDominik Schürmann2016-01-1172-17/+121
| |
* | Use tor icon for settings screenDominik Schürmann2016-01-1168-1/+14
| |
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-1057-727/+753
|/ | | | what tokens are supported
* Merge pull request #1597 from open-keychain/inline-ttlDominik Schürmann2016-01-0622-257/+756
|\ | | | | Select time to remember password in dialog