diff options
| author | Luca Stefani <luca020400@lineageos.org> | 2017-06-27 18:09:13 +0200 |
|---|---|---|
| committer | dianlujitao <dianlujitao@lineageos.org> | 2017-06-28 15:47:21 +0800 |
| commit | d1e7aec1d9a2fbe971521a48d7510c06ef07e939 (patch) | |
| tree | 6d9206381c1588213c5a4d0b1a31981e7d4a6954 | |
| parent | 53b0ba33a29d152c283f56b24655e708aea50558 (diff) | |
| download | android_packages_apps_Messaging-d1e7aec1d9a2fbe971521a48d7510c06ef07e939.tar.gz android_packages_apps_Messaging-d1e7aec1d9a2fbe971521a48d7510c06ef07e939.tar.bz2 android_packages_apps_Messaging-d1e7aec1d9a2fbe971521a48d7510c06ef07e939.zip | |
Messaging: Don't crash on unsupported shared content type
Change-Id: Ibbd164ecf73ed5b7d4af0cdc0ca670085e96633c
| -rw-r--r-- | src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java index debd7fc..24d8329 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -37,11 +37,14 @@ import com.android.messaging.util.LogUtil; import com.android.messaging.util.MediaMetadataRetrieverWrapper; import com.android.messaging.util.FileUtil; import com.android.messaging.util.OsUtil; +import com.android.messaging.util.UiUtils; import com.android.messaging.util.UriUtil; import java.io.IOException; import java.util.ArrayList; +import com.android.messaging.R; + public class ShareIntentActivity extends BaseBugleActivity implements ShareIntentFragment.HostInterface { @@ -107,7 +110,10 @@ public class ShareIntentActivity extends BaseBugleActivity implements } } else { // Unsupported content type. - Assert.fail("Unsupported shared content type for " + contentUri + ": " + contentType + finish(); + UiUtils.showToastAtBottom(R.string.attachment_load_failed_dialog_message); + LogUtil.e(LogUtil.BUGLE_TAG, + "Unsupported shared content type for " + contentUri + ": " + contentType + " (" + intent.getType() + ")"); } } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) { @@ -131,7 +137,9 @@ public class ShareIntentActivity extends BaseBugleActivity implements } } else { // Unsupported content type. - Assert.fail("Unsupported shared content type: " + contentType); + finish(); + UiUtils.showToastAtBottom(R.string.attachment_load_failed_dialog_message); + LogUtil.e(LogUtil.BUGLE_TAG, "Unsupported shared content type: " + contentType); } } else { // Unsupported action. |