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

multidcrypt: display k9 download only after decryption failure

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-17 19:48:51 +02:00
parent 82ee9d440b
commit fdb1a7384e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
View File

@@ -162,10 +162,6 @@ public class DecryptActivity extends BaseActivity {
Uri uri = intent.getData(); Uri uri = intent.getData();
if (uri != null) { if (uri != null) {
if ("com.fsck.k9.attachmentprovider".equals(uri.getHost())) {
Toast.makeText(this, R.string.error_reading_k9, Toast.LENGTH_LONG).show();
}
if ("com.android.email.attachmentprovider".equals(uri.getHost())) { if ("com.android.email.attachmentprovider".equals(uri.getHost())) {
Toast.makeText(this, R.string.error_reading_aosp, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.error_reading_aosp, Toast.LENGTH_LONG).show();
finish(); finish();

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View File

@@ -56,6 +56,7 @@ import android.widget.PopupMenu.OnDismissListener;
import android.widget.PopupMenu.OnMenuItemClickListener; import android.widget.PopupMenu.OnMenuItemClickListener;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import android.widget.ViewAnimator; import android.widget.ViewAnimator;
import com.cocosw.bottomsheet.BottomSheet; import com.cocosw.bottomsheet.BottomSheet;
@@ -304,6 +305,11 @@ public class DecryptListFragment
final Uri uri = mCurrentInputUri; final Uri uri = mCurrentInputUri;
mCurrentInputUri = null; mCurrentInputUri = null;
Activity activity = getActivity();
if (activity != null && "com.fsck.k9.attachmentprovider".equals(uri.getHost())) {
Toast.makeText(getActivity(), R.string.error_reading_k9, Toast.LENGTH_LONG).show();
}
mAdapter.addResult(uri, result); mAdapter.addResult(uri, result);
cryptoOperation(); cryptoOperation();

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

@@ -1541,7 +1541,7 @@
<string name="error_empty_log">"(error, empty log)"</string> <string name="error_empty_log">"(error, empty log)"</string>
<string name="error_reading_text">"Could not read input to decrypt!"</string> <string name="error_reading_text">"Could not read input to decrypt!"</string>
<string name="error_reading_aosp">"Failed reading data, this is a bug in the Android E-Mail client! (Issue #290)"</string> <string name="error_reading_aosp">"Failed reading data, this is a bug in the Android E-Mail client! (Issue #290)"</string>
<string name="error_reading_k9">"If decryption fails, press 'Download complete message' in K-9 Mail!"</string> <string name="error_reading_k9">"Received incomplete data, try pressing 'Download complete message' in K-9 Mail!"</string>
<string name="filename_unknown">Unknown filename (click to open)</string> <string name="filename_unknown">Unknown filename (click to open)</string>
<string name="filename_unknown_text">Text (click to show)</string> <string name="filename_unknown_text">Text (click to show)</string>
<string name="intent_show">Show Signed/Encrypted Content</string> <string name="intent_show">Show Signed/Encrypted Content</string>