diff options
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 14 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 86b3bc14..fd5f2188 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -337,23 +337,23 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc } protected Intent getShareIntent(String text, String subject) { - Intent sendIntent = new Intent(Intent.ACTION_SEND); - sendIntent.setType("text/plain"); - sendIntent.putExtra(Intent.EXTRA_TEXT, text); + Intent shareIntent = new Intent(Intent.ACTION_SEND); + shareIntent.setType("text/plain"); + shareIntent.putExtra(Intent.EXTRA_TEXT, text); if (subject != null) { - sendIntent.putExtra(Intent.EXTRA_SUBJECT, subject); + shareIntent.putExtra(Intent.EXTRA_SUBJECT, subject); } - return Intent.createChooser(sendIntent, null); + return shareIntent; } protected void shareText(String text) { - startActivity(Intent.createChooser(getShareIntent(text, null), text)); + startActivity(Intent.createChooser(getShareIntent(text, null), null)); } protected void shareText(String text, String subject) { - startActivity(Intent.createChooser(getShareIntent(text, subject), text)); + startActivity(Intent.createChooser(getShareIntent(text, subject), null)); } protected void shareImageFromUri(String url) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java index bbcd1dd1..8e2a19f9 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java @@ -76,6 +76,8 @@ public class GalleryVideoFragment extends GalleryBaseFragment { public void onPlayerError(PlaybackException error) { Log.d(TAG, "onPlayerError:" + error); + view.findViewById(R.id.flavor_image_progress).setVisibility(View.GONE); + TextView errorView = view.findViewById(R.id.flavor_image_error); if (errorView != null) { @@ -89,7 +91,7 @@ public class GalleryVideoFragment extends GalleryBaseFragment { public void onIsLoadingChanged(boolean isLoading) { Log.d(TAG, "onIsLoadingChanged" + isLoading); - view.findViewById(R.id.flavor_image_progress).setVisibility(isLoading ? View.VISIBLE : View.GONE); + view.findViewById(R.id.flavor_image_progress).setVisibility(View.GONE); playerView.hideController(); } |
