aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #311 from emdete/masterDominik Schürmann2014-02-281-3/+3
|\ | | | | prevent null byte[] in case of encoding exc
| * prevent null byte[] in case of encoding excM. Dietrich2014-02-281-3/+3
| |
* | Fix binding of install intents to packageDominik Schürmann2014-02-271-1/+1
| |
* | cleanupDominik Schürmann2014-02-274-40/+22
| |
* | remove dublication of api library, let both proejcts depend on the sameDominik Schürmann2014-02-2722-1339/+2
| |
* | Merge pull request #305 from hav3n/branch-dialog-fragmentDominik Schürmann2014-02-274-126/+272
|\ \ | | | | | | Partial fix for #304
| * | Added GPL headersNikhil Peter Raj2014-02-272-11/+31
| | |
| * | Complete fix for #304Nikhil Peter Raj2014-02-272-94/+170
| | |
| * | Partial fix for #304Nikhil Peter Raj2014-02-262-32/+82
| | |
* | | Merge pull request #308 from mar-v-in/issue-295Dominik Schürmann2014-02-272-3/+48
|\ \ \ | | | | | | | | Show link to Market if no openpgp provider installed installed
| * | | Change resource name and remove unneeded if from 44232afmar-v-in2014-02-272-13/+11
| | | |
| * | | Show link to Market if no openpgp provider installed installedmar-v-in2014-02-272-3/+50
|/ / / | | | | | | | | | Issue #295
* | | Merge pull request #303 from hav3n/branch-fix-iconDominik Schürmann2014-02-257-2/+6
|\| | | | | | | | Fix for #266
| * | Final fix for #266Nikhil Peter Raj2014-02-262-2/+2
| | | | | | | | | | | | | | | -Fix implemented using setIcon() as setIconAttribute() is not valid for API less than 11
| * | Removed Thumbs.db,added to gitignoreNikhil Peter Raj2014-02-255-0/+3
| | |
| * | Fix for #266Nikhil Peter Raj2014-02-2510-2/+3
|/ / | | | | | | | | -Extra: Added the appropriate images to drawable folder from Android SDK source, can be used as alternative if required.
* | Merge pull request #300 from danielhass/masterDominik Schürmann2014-02-251-16/+17
|\ \ | |/ |/| Replaced Toast with AppMsg in DecryptActivity
| * Replaced Toast with AppMsg in DecryptActivityDaniel Haß2014-02-241-16/+17
|/
* reapply accedentially reverted 5d8867260946937498cf9e8d64fea3a9f53d9dd3Dominik Schürmann2014-02-242-2/+20
|
* cleanupDominik Schürmann2014-02-241-57/+7
|
* fix signature passing and verify in demoDominik Schürmann2014-02-242-6/+7
|
* Merge pull request #296 from danielhass/masterDominik Schürmann2014-02-241-12/+13
|\ | | | | Replaced Toasts with AppMsg library in EncryptActivity
| * remove debug stuffDaniel Haß2014-02-231-2/+1
| |
| * Revert "Replaced Toast with AppMsg in EncryptActivity"Daniel Haß2014-02-231-13/+15
| | | | | | | | This reverts commit e936a4762b4c6ed8153d216ab4655e251c4366f3.
| * Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-15/+13
| |
| * Replaced Toast with AppMsg in EncryptActivityDaniel Haß2014-02-231-13/+15
|/
* Update help_start.htmlDominik Schürmann2014-02-231-1/+1
|
* fix openpgp4fpr demoDominik Schürmann2014-02-211-1/+1
|
* AndroidManfiest code for later...Dominik Schürmann2014-02-212-3/+23
|
* import key from email app directlyDominik Schürmann2014-02-211-25/+37
|
* remove logging from libraryDominik Schürmann2014-02-216-54/+32
|
* do not serialize async tasksDominik Schürmann2014-02-211-1/+10
|
* fix intent demo crash, remove unused layoutDominik Schürmann2014-02-212-94/+1
|
* api example: fix crash when no signature is presentDominik Schürmann2014-02-211-1/+1
|
* precompile user id patternDominik Schürmann2014-02-211-2/+3
|
* renameDominik Schürmann2014-02-212-7/+7
|
* add project.properties to support EclipseDominik Schürmann2014-02-212-0/+30
|
* internal renaming, cleanupDominik Schürmann2014-02-215-36/+50
|
* verification of cleartext signatures worksDominik Schürmann2014-02-216-49/+125
|
* rename to OpenKeychainDominik Schürmann2014-02-213-10/+10
|
* Merge pull request #282 from danielhass/masterDominik Schürmann2014-02-2016-6/+1442
|\ | | | | Replaced Toasts with AppMsg library
| * Added AppMsg library to the librarys-folderDaniel Haß2014-02-2011-0/+1430
| |
| * Added whitespacesDaniel Haß2014-02-201-1/+1
| |
| * Added AppMsg libraryDaniel Haß2014-02-201-0/+1
| |
| * Added AppMsg libraryDaniel Haß2014-02-201-1/+1
| |
| * Fixed the typo and whitespace issueDaniel Haß2014-02-201-2/+2
| |
| * Updated library section (AppMsg library)Daniel Haß2014-02-201-0/+3
| |
| * Updated library section (AppMsg library)Daniel Haß2014-02-201-1/+2
| |
| * Revert "Added AppMsg dependency to gradle"Daniel Haß2014-02-201-1/+0
| | | | | | | | This reverts commit 51e6bbcf7a9441f1b13a87a75e5ab20277f11356.
| * Deleted Toast importDaniel Haß2014-02-201-1/+0
| |