aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #1716 from open-keychain/backup-v2Dominik Schürmann2016-02-1010-1207/+394
|\ | | | | Backup Format v2
| * Fix landscape orientationDominik Schürmann2016-02-101-0/+199
| |
| * Use non-breaking spaces for backup code MaskedEditTextDominik Schürmann2016-02-103-2/+11
| |
| * Backup format v2: redesign restore dialogDominik Schürmann2016-02-103-134/+34
| |
| * Backup format v2: redesigned backup code fragment with masked edit textDominik Schürmann2016-02-106-1201/+278
| |
| * Add masked-edittext libraryDominik Schürmann2016-02-101-41/+43
|/
* update readme for fdroid flavorVincent2016-02-101-4/+4
|
* Merge pull request #1708 from open-keychain/performanceVincent2016-02-1018-181/+535
|\ | | | | performance improvements
| * Merge branch 'master' into performanceVincent Breitmoser2016-02-10103-436/+571
| |\
| * | performance: add license headers and some documentationVincent Breitmoser2016-02-105-14/+72
| | |
| * | performance: use more canonical hashCode implementationVincent Breitmoser2016-02-051-4/+4
| | |
| * | performance: fix unit testsVincent Breitmoser2016-02-054-23/+51
| | |
| * | 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
| | |
* | | Merge pull request #1705 from fidesmo/feature-better-transaction-animationDominik Schürmann2016-02-1012-207/+186
|\ \ \ | |_|/ |/| | Better transaction animation
| * | Better transaction animationTheo Franzén2016-02-1012-207/+186
|/ /
* | 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
| |
* | Fix jacoco taskDominik Schürmann2016-02-091-1/+1
| |
* | Add donation fragmentDominik Schürmann2016-02-095-32/+133
| |
* | Add ignore = dirty to submodules configDominik Schürmann2016-02-091-0/+2
| |
* | Merge pull request #1715 from open-keychain/bouncyDominik Schürmann2016-02-0992-375/+371
|\ \ | | | | | | Switch to Bouncy Castle
| * | Exclude robolectric's transitive bouncycastle dependencyDominik Schürmann2016-02-091-1/+3
| | |
| * | Remove leftovers from spongycastleDominik Schürmann2016-02-095-10/+5
| | |
| * | Replace spongycastle with bouncycastleDominik Schürmann2016-02-0989-362/+362
| | |
| * | Add bouncycastle submoduleDominik Schürmann2016-02-092-0/+3
| | |
| * | 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
| |