diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-17 19:48:51 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-17 19:48:51 +0200 |
| commit | fdb1a7384e81d6b395ec6d930a1df46eb7db9496 (patch) | |
| tree | 8bb0e268a70fb60a42aad7145406de7494a3e0f7 /OpenKeychain/src/main/java/org | |
| parent | 82ee9d440b804030682f28669d08650b6ade6ec2 (diff) | |
| download | open-keychain-fdb1a7384e81d6b395ec6d930a1df46eb7db9496.tar.gz open-keychain-fdb1a7384e81d6b395ec6d930a1df46eb7db9496.tar.bz2 open-keychain-fdb1a7384e81d6b395ec6d930a1df46eb7db9496.zip | |
multidcrypt: display k9 download only after decryption failure
Diffstat (limited to 'OpenKeychain/src/main/java/org')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 4b80af437..5eb9963f5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -162,10 +162,6 @@ public class DecryptActivity extends BaseActivity { Uri uri = intent.getData(); 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())) { Toast.makeText(this, R.string.error_reading_aosp, Toast.LENGTH_LONG).show(); finish(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java index ca89509c5..dcba595e9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -56,6 +56,7 @@ import android.widget.PopupMenu.OnDismissListener; import android.widget.PopupMenu.OnMenuItemClickListener; import android.widget.ProgressBar; import android.widget.TextView; +import android.widget.Toast; import android.widget.ViewAnimator; import com.cocosw.bottomsheet.BottomSheet; @@ -304,6 +305,11 @@ public class DecryptListFragment final Uri uri = mCurrentInputUri; 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); cryptoOperation(); |