diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-15 21:29:01 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-15 21:29:01 +0200 |
| commit | fcb73f4e24b04ebcf6f139f8aa17d2ce5ed33a78 (patch) | |
| tree | 1f9d239570a70bc7b2820c2b99ad71d9398432f3 /OpenKeychain | |
| parent | 8440693c510da39870bfba241ed3cdbd37d6dad3 (diff) | |
| parent | 0f5093c0b335dccc2f6431febc391d1fbf068944 (diff) | |
| download | open-keychain-fcb73f4e24b04ebcf6f139f8aa17d2ce5ed33a78.tar.gz open-keychain-fcb73f4e24b04ebcf6f139f8aa17d2ce5ed33a78.tar.bz2 open-keychain-fcb73f4e24b04ebcf6f139f8aa17d2ce5ed33a78.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java | 11 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/raw/help_wot.html | 21 |
2 files changed, 29 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java index 32f37a0a5..8e93dc4e8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java @@ -63,17 +63,22 @@ public class HelpActivity extends ActionBarActivity { mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_faq)), HelpHtmlFragment.class, faqBundle, (selectedTab == 1)); + Bundle wotBundle = new Bundle(); + wotBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_wot); + mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_wot)), + HelpHtmlFragment.class, wotBundle, (selectedTab == 2)); + Bundle nfcBundle = new Bundle(); nfcBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_nfc_beam); mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_nfc_beam)), - HelpHtmlFragment.class, nfcBundle, (selectedTab == 2)); + HelpHtmlFragment.class, nfcBundle, (selectedTab == 3)); Bundle changelogBundle = new Bundle(); changelogBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_changelog); mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_changelog)), - HelpHtmlFragment.class, changelogBundle, (selectedTab == 3)); + HelpHtmlFragment.class, changelogBundle, (selectedTab == 4)); mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_about)), - HelpAboutFragment.class, null, (selectedTab == 4)); + HelpAboutFragment.class, null, (selectedTab == 5)); } } diff --git a/OpenKeychain/src/main/res/raw/help_wot.html b/OpenKeychain/src/main/res/raw/help_wot.html new file mode 100644 index 000000000..5f3ec6c24 --- /dev/null +++ b/OpenKeychain/src/main/res/raw/help_wot.html @@ -0,0 +1,21 @@ +<!-- Maintain structure with headings with h2 tags and content with p tags. +This makes it easy to translate the values with transifex! +And don't add newlines before or after p tags because of transifex --> +<html> +<head> +</head> +<body> +<h2>Web of Trust</h2> +<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is integral to know that the public key you encrypt to belongs to the person you think it does.</p> + +<h2>Support in OpenKeychain</h2> +<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p> + +<h2>Trust Model</h2> +<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p> + +<h2>Certifying keys</h2> +<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p> + +</body> +</html> |