aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Add backup APIDominik Schürmann2016-03-019-27/+213
* Update to support lib 23.2.0Dominik Schürmann2016-02-291-1/+2
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-02-237-25/+229
|\
| * Merge pull request #1727 from open-keychain/mime-fallbackVincent2016-02-237-25/+229
| |\
| | * ditch isLikelyText flag, set mimeType to text/plain in that caseVincent Breitmoser2016-02-234-19/+27
| | * move CharsetVerifier to utils packageVincent Breitmoser2016-02-233-2/+3
| | * documentation and cleanupVincent Breitmoser2016-02-223-4/+24
| | * displaytext: add "View Log" option, move "Copy to clipboard" into overflow menuVincent Breitmoser2016-02-222-1/+16
| | * decrypt: always show "View in OpenKeychain" as intent chooser option iff isLi...Vincent Breitmoser2016-02-221-0/+12
| | * decryptVerify: use CharsetVerifier to guess whether data is binary or notVincent Breitmoser2016-02-221-10/+19
| | * externalize CharsetVerifier, add looksLikeText to OpenPgpMetadata objectVincent Breitmoser2016-02-223-87/+148
| | * mime: try to decode with given charset or utf-8 while file is readVincent Breitmoser2016-02-222-6/+84
* | | Passthrough of data Intent in methods of ApiPendingIntentFactory instead of c...Dominik Schürmann2016-02-233-50/+58
|/ /
* / Remove AspectRatioImageViewunyoungwax2016-02-231-138/+0
|/
* Extend documentation, proper method naming, use of deprecated method annotationDominik Schürmann2016-02-226-44/+51
* Use FLAG_IMMUTABLEDominik Schürmann2016-02-221-6/+22
* Move PendingIntent creation into factoryDominik Schürmann2016-02-223-140/+201
* Split remote methods from activities for better seperationDominik Schürmann2016-02-227-57/+127
* Extract service parts from SecurityTokenOperationActivityDominik Schürmann2016-02-224-23/+62
* Use BC provider as default oneDominik Schürmann2016-02-211-3/+7
* Split RemoteServiceActivity into multiple activitiesDominik Schürmann2016-02-1511-377/+468
* Use non-breaking spaces for backup code MaskedEditTextDominik Schürmann2016-02-101-2/+7
* Backup format v2: redesign restore dialogDominik Schürmann2016-02-102-46/+24
* Backup format v2: redesigned backup code fragment with masked edit textDominik Schürmann2016-02-102-124/+81
* Merge pull request #1708 from open-keychain/performanceVincent2016-02-1014-158/+484
|\
| * Merge branch 'master' into performanceVincent Breitmoser2016-02-1049-253/+350
| |\
| * | 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-101-0/+16
| |/ |/|
* | Fix SecurityException on Android 6 due to remove contacts on disabled syncDominik Schürmann2016-02-093-5/+12
* | Add donation fragmentDominik Schürmann2016-02-092-7/+70
* | Remove leftovers from spongycastleDominik Schürmann2016-02-093-5/+3
* | Replace spongycastle with bouncycastleDominik Schürmann2016-02-0940-212/+212
* | delete linked contacts on turning off contact syncAdithya Abraham Philip2016-02-065-8/+36
|/
* import: handle FileNotFoundException (fixes #1688)Vincent Breitmoser2016-02-014-31/+40
* prevent rare KeyserverSyncAdapterService crashAdithya Abraham Philip2016-01-272-10/+26
* Merge pull request #1683 from eighthave/masterDominik Schürmann2016-01-262-0/+101
|\
| * after receiving panic trigger and locking app, remove from historyHans-Christoph Steiner2016-01-132-0/+53
| * respond to generic panic trigger Intent by clearing passphrasesHans-Christoph Steiner2016-01-131-0/+48
* | 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-203-1/+193
|\| |
| * | Handle not installed PGP appletTheo Franzén2016-01-153-1/+193
| |/
* / No PendingIntent for RESULT_NO_SIGNATURE, RESULT_INVALID_SIGNATUREDominik Schürmann2016-01-201-7/+20
|/
* 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