summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java12
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.