From 8e53a7aa88044426df74219dde6ba1ee14d80472 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 18 Aug 2015 19:35:38 +0300
Subject: fix sharing of article videos; do not crash if prepareasync has
 already been called

---
 org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java
index 48a0e9ff..92c63b48 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/VideoPlayerActivity.java
@@ -143,7 +143,11 @@ public class VideoPlayerActivity extends CommonActivity {
             @Override
             public void surfaceCreated(SurfaceHolder holder) {
                 mediaPlayer.setDisplay(holder);
-                mediaPlayer.prepareAsync();
+                try {
+                    mediaPlayer.prepareAsync();
+                } catch (IllegalStateException e) {
+                    e.printStackTrace();
+                }
                 mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
                       @Override
                       public void onPrepared(MediaPlayer mp) {
@@ -238,6 +242,7 @@ public class VideoPlayerActivity extends CommonActivity {
                 if (m_streamUri != null) {
                     Intent intent = new Intent(Intent.ACTION_SEND);
 
+                    intent.setType("text/plain");
                     intent.putExtra(Intent.EXTRA_SUBJECT, m_streamUri);
                     intent.putExtra(Intent.EXTRA_TEXT, m_streamUri);
 
-- 
cgit v1.2.3