From b4a9d1a2db941a66bade5be2e12fe3ea7f1a3f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 7 May 2014 18:31:31 +0200 Subject: [PATCH] Add applications section to help --- .../remote/ui/RemoteServiceActivity.java | 4 ++-- .../keychain/ui/HelpAboutFragment.java | 2 +- .../keychain/ui/HelpHtmlFragment.java | 2 +- .../ui/dialog/ShareNfcDialogFragment.java | 2 +- .../drawable-xxhdpi/apps_conversations.png | Bin 0 -> 3272 bytes .../src/main/res/drawable-xxhdpi/apps_k9.png | Bin 0 -> 15207 bytes .../src/main/res/raw-de/help_start.html | 19 ------------------ OpenKeychain/src/main/res/raw/help_start.html | 5 +++++ OpenKeychain/src/main/res/values/strings.xml | 2 +- extern/html-textview | 2 +- 10 files changed, 12 insertions(+), 26 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/apps_conversations.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/apps_k9.png delete mode 100644 OpenKeychain/src/main/res/raw-de/help_start.html diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java index 2fd1ad3b5..d0b958844 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java @@ -250,7 +250,7 @@ public class RemoteServiceActivity extends ActionBarActivity { // set text on view HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_select_pub_keys_text); - textView.setHtmlFromString(text); + textView.setHtmlFromString(text, true); /* Load select pub keys fragment */ // Check that the activity is using the layout version with @@ -292,7 +292,7 @@ public class RemoteServiceActivity extends ActionBarActivity { // set text on view HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_app_error_message_text); - textView.setHtmlFromString(text); + textView.setHtmlFromString(text, true); } else { Log.e(Constants.TAG, "Action does not exist!"); setResult(RESULT_CANCELED); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java index ec9f3a759..5909970af 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java @@ -45,7 +45,7 @@ public class HelpAboutFragment extends Fragment { HtmlTextView aboutTextView = (HtmlTextView) view.findViewById(R.id.help_about_text); // 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 aboutTextView.setTextColor(getResources().getColor(android.R.color.black)); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java index 98c84e5e3..a3f0ef614 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java @@ -66,7 +66,7 @@ public class HelpHtmlFragment extends Fragment { scroller.addView(text); // 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 text.setTextColor(getResources().getColor(android.R.color.black)); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java index 15df53dcc..cd2364d7c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java @@ -78,7 +78,7 @@ public class ShareNfcDialogFragment extends DialogFragment { + getString(R.string.error_nfc_needed)); } else { // 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, new DialogInterface.OnClickListener() { diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apps_conversations.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apps_conversations.png new file mode 100644 index 0000000000000000000000000000000000000000..9dbbdd9713a9a9fbb333072d33334dfcd3c23a74 GIT binary patch literal 3272 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 - - -

Los gehts

-

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.

- -

It is recommended that you install OI File Manager for enhanced file selection and Barcode Scanner to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.

- -

Ich habe einen Fehler in OpenKeychain gefunden!

-

Please report the bug using the issue tracker of OpenKeychain.

- -

Unterstützen

-

If you want to help us developing OpenKeychain by contributing code follow our small guide on Github.

- -

Übersetzungen

-

Help translating OpenKeychain! Everybody can participate at OpenKeychain on Transifex.

- - - diff --git a/OpenKeychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html index 4b2bdf722..0a1da56f4 100644 --- a/OpenKeychain/src/main/res/raw/help_start.html +++ b/OpenKeychain/src/main/res/raw/help_start.html @@ -10,6 +10,11 @@ And don't add newlines before or after p tags because of transifex -->

It is recommended that you install OI File Manager for enhanced file selection and Barcode Scanner to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.

+

Applications

+

Several applications support OpenKeychain to encrypt/sign your private communication:

+

Conversations: Jabber/XMPP client

+

K-9 Mail: OpenKeychain support available in current alpha build!

+

I found a bug in OpenKeychain!

Please report the bug using the issue tracker of OpenKeychain.

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index fd9920cfe..4d39b6273 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -413,7 +413,7 @@ Decrypt with OpenKeychain - No registered applications!\n\nThird-party applications can request access to OpenKeychain. After granting access, they will be listed here. + No registered applications!\n\nA list of supported third-party applications can be found in \'Help\'! Show advanced information Hide advanced information Show advanced settings diff --git a/extern/html-textview b/extern/html-textview index 30fbf60cc..bae0199d6 160000 --- a/extern/html-textview +++ b/extern/html-textview @@ -1 +1 @@ -Subproject commit 30fbf60ccfa8732e8fc4d3c97b94c4809ef871a5 +Subproject commit bae0199d69c05b9df242b323eda2f8bb4fb1081b