diff options
author | Luca Stefani <luca020400@lineageos.org> | 2017-06-27 18:09:13 +0200 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2019-10-29 20:23:47 +0200 |
commit | 6a8b1eb7121682c90a18f2985ab3325a83f53511 (patch) | |
tree | 7286473c3b6199bf62e0d92a7bcc0dfe485c43c5 /src | |
parent | a791477eea2485f2384e22aa6a688b27222f8b0c (diff) | |
download | android_packages_apps_Messaging-6a8b1eb7121682c90a18f2985ab3325a83f53511.tar.gz android_packages_apps_Messaging-6a8b1eb7121682c90a18f2985ab3325a83f53511.tar.bz2 android_packages_apps_Messaging-6a8b1eb7121682c90a18f2985ab3325a83f53511.zip |
Messaging: Don't crash on unsupported shared content type
Change-Id: Ibbd164ecf73ed5b7d4af0cdc0ca670085e96633c
Diffstat (limited to 'src')
-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 1c91e46..6d51de2 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -35,11 +35,14 @@ import com.android.messaging.util.ContentType; import com.android.messaging.util.LogUtil; import com.android.messaging.util.MediaMetadataRetrieverWrapper; import com.android.messaging.util.FileUtil; +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)) { @@ -133,7 +139,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. |