cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1727 from open-keychain/mime-fallback

Browse Source 
try to guess if data is text or not
This commit is contained in:
Vincent
2016-02-23 16:01:13 +01:00
parent c1d268a5ec 03e695c650
commit fd24acbf0e
11 changed files with 526 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenKeychain/src/main/res/menu/decrypt_menu.xml
View File

@@ -2,16 +2,21 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/decrypt_copy"
android:title="@string/btn_copy_decrypted_text"
android:icon="@drawable/ic_content_copy_black_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/decrypt_share"
android:title="@string/btn_share_decrypted_text"
android:icon="@drawable/ic_share_black_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/decrypt_copy"
android:title="@string/btn_copy_decrypted_text"
android:icon="@drawable/ic_content_copy_black_24dp"
app:showAsAction="never" />
<item
android:id="@+id/decrypt_view_log"
android:title="@string/btn_view_log"
app:showAsAction="never" />
</menu>

6
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -95,7 +95,7 @@
<string name="btn_add_files">"Add file(s)"</string>
<string name="btn_share_decrypted_text">"Share"</string>
<string name="btn_open_with">"Open with…"</string>
<string name="btn_copy_decrypted_text">"Copy decrypted text"</string>
<string name="btn_copy_decrypted_text">"Copy to clipboard"</string>
<string name="btn_decrypt_clipboard">"Read from clipboard"</string>
<string name="btn_decrypt_files">"Select input file"</string>
<string name="btn_encrypt_files">"Encrypt files"</string>
@@ -1401,6 +1401,10 @@
<string name="msg_data_mime_filename">"Filename: '%s'"</string>
<string name="msg_data_mime_from_extension">"Guessing MIME type from extension"</string>
<string name="msg_data_mime_length">"Content-Length: %s"</string>
<string name="msg_data_mime_charset">"Charset is '%s'"</string>
<string name="msg_data_mime_charset_faulty">"Charset is '%s', but decoding failed!"</string>
<string name="msg_data_mime_charset_guess">"Charset appears to be '%s'"</string>
<string name="msg_data_mime_charset_unknown">"Charset is unknown, or data is not text."</string>
<string name="msg_data_mime">"Parsing MIME data structure"</string>
<string name="msg_data_mime_ok">"Finished parsing"</string>
<string name="msg_data_mime_none">"No MIME structure found"</string>