diff options
author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-16 16:26:51 +0100 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-16 16:29:04 +0100 |
commit | e3df05279a6bff00bdd5ecd9645e114dda9e51d3 (patch) | |
tree | 5e038e400110c23da8a8b3cbd556b9605d6a249a | |
parent | ba48bbee51fedc78834a6ba313c9e482884e4e0c (diff) | |
download | android_packages_apps_Messaging-e3df05279a6bff00bdd5ecd9645e114dda9e51d3.tar.gz android_packages_apps_Messaging-e3df05279a6bff00bdd5ecd9645e114dda9e51d3.tar.bz2 android_packages_apps_Messaging-e3df05279a6bff00bdd5ecd9645e114dda9e51d3.zip |
Revert "Messaging: Don't crash on unsupported shared content type"
This reverts commit 7cc94cfded563a77912a084f2a105d6641107d7a.
Change-Id: Id58e2dbed3330428f6e781aee7c3a6b41d4e7058
-rw-r--r-- | src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java index 6d51de2..1c91e46 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -35,14 +35,11 @@ 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 { @@ -110,10 +107,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements } } else { // Unsupported content type. - finish(); - UiUtils.showToastAtBottom(R.string.attachment_load_failed_dialog_message); - LogUtil.e(LogUtil.BUGLE_TAG, - "Unsupported shared content type for " + contentUri + ": " + contentType + Assert.fail("Unsupported shared content type for " + contentUri + ": " + contentType + " (" + intent.getType() + ")"); } } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) { @@ -139,9 +133,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements } } else { // Unsupported content type. - finish(); - UiUtils.showToastAtBottom(R.string.attachment_load_failed_dialog_message); - LogUtil.e(LogUtil.BUGLE_TAG, "Unsupported shared content type: " + contentType); + Assert.fail("Unsupported shared content type: " + contentType); } } else { // Unsupported action. |