PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Add applications section to help

Browse source
This commit is contained in:
Dominik Schürmann 2014-05-07 18:31:31 +02:00
parent b817a0a2a8
commit b4a9d1a2db
10 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
View file

@ -250,7 +250,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
// set text on view // set text on view
HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_select_pub_keys_text); HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_select_pub_keys_text);
textView.setHtmlFromString(text); textView.setHtmlFromString(text, true);
/* Load select pub keys fragment */ /* Load select pub keys fragment */
// Check that the activity is using the layout version with // Check that the activity is using the layout version with
@ -292,7 +292,7 @@ public class RemoteServiceActivity extends ActionBarActivity {
// set text on view // set text on view
HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_app_error_message_text); HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_app_error_message_text);
textView.setHtmlFromString(text); textView.setHtmlFromString(text, true);
} else { } else {
Log.e(Constants.TAG, "Action does not exist!"); Log.e(Constants.TAG, "Action does not exist!");
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java
View file

@ -45,7 +45,7 @@ public class HelpAboutFragment extends Fragment {
HtmlTextView aboutTextView = (HtmlTextView) view.findViewById(R.id.help_about_text); HtmlTextView aboutTextView = (HtmlTextView) view.findViewById(R.id.help_about_text);
// load html from raw resource (Parsing handled by HtmlTextView library) // load html from raw resource (Parsing handled by HtmlTextView library)
aboutTextView.setHtmlFromRawResource(getActivity(), R.raw.help_about); aboutTextView.setHtmlFromRawResource(getActivity(), R.raw.help_about, true);
// no flickering when clicking textview for Android < 4 // no flickering when clicking textview for Android < 4
aboutTextView.setTextColor(getResources().getColor(android.R.color.black)); aboutTextView.setTextColor(getResources().getColor(android.R.color.black));

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java
View file

@ -66,7 +66,7 @@ public class HelpHtmlFragment extends Fragment {
scroller.addView(text); scroller.addView(text);
// load html from raw resource (Parsing handled by HtmlTextView library) // load html from raw resource (Parsing handled by HtmlTextView library)
text.setHtmlFromRawResource(getActivity(), mHtmlFile); text.setHtmlFromRawResource(getActivity(), mHtmlFile, true);
// no flickering when clicking textview for Android < 4 // no flickering when clicking textview for Android < 4
text.setTextColor(getResources().getColor(android.R.color.black)); text.setTextColor(getResources().getColor(android.R.color.black));

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java
View file

@ -78,7 +78,7 @@ public class ShareNfcDialogFragment extends DialogFragment {
+ getString(R.string.error_nfc_needed)); + getString(R.string.error_nfc_needed));
} else { } else {
// nfc works... // nfc works...
textView.setHtmlFromRawResource(getActivity(), R.raw.nfc_beam_share); textView.setHtmlFromRawResource(getActivity(), R.raw.nfc_beam_share, true);
alert.setNegativeButton(R.string.menu_beam_preferences, alert.setNegativeButton(R.string.menu_beam_preferences,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/apps_conversations.png Normal file
View file

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/apps_k9.png Normal file
View file

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

19
OpenKeychain/src/main/res/raw-de/help_start.html
View file

@ -1,19 +0,0 @@
<html>
<head></head>
<body>
<h2>Los gehts</h2>
<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
<h2>Ich habe einen Fehler in OpenKeychain gefunden!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
<h2>Unterstützen</h2>
<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
<h2>Übersetzungen</h2>
<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
</body>
</html>

5
OpenKeychain/src/main/res/raw/help_start.html
View file

@ -10,6 +10,11 @@ And don't add newlines before or after p tags because of transifex -->
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
<h2>Applications</h2>
<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"/>Conversations</a>: Jabber/XMPP client</p>
<p><img src="apps_k9"/>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
<h2>I found a bug in OpenKeychain!</h2> <h2>I found a bug in OpenKeychain!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p> <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>

2
OpenKeychain/src/main/res/values/strings.xml
View file

@ -413,7 +413,7 @@
<string name="intent_send_decrypt">Decrypt with OpenKeychain</string> <string name="intent_send_decrypt">Decrypt with OpenKeychain</string>
<!-- Remote API --> <!-- Remote API -->
<string name="api_no_apps">No registered applications!\n\nThird-party applications can request access to OpenKeychain. After granting access, they will be listed here.</string> <string name="api_no_apps">No registered applications!\n\nA list of supported third-party applications can be found in \'Help\'!</string>
<string name="api_settings_show_info">Show advanced information</string> <string name="api_settings_show_info">Show advanced information</string>
<string name="api_settings_hide_info">Hide advanced information</string> <string name="api_settings_hide_info">Hide advanced information</string>
<string name="api_settings_show_advanced">Show advanced settings</string> <string name="api_settings_show_advanced">Show advanced settings</string>

2
extern/html-textview vendored

@ -1 +1 @@
Subproject commit 30fbf60ccfa8732e8fc4d3c97b94c4809ef871a5 Subproject commit bae0199d69c05b9df242b323eda2f8bb4fb1081b