diff options
| author | fox <fox@fakecake.org> | 2026-02-13 20:56:00 +0300 |
|---|---|---|
| committer | fox <fox@fakecake.org> | 2026-02-13 20:56:00 +0300 |
| commit | 9a7329c767dc855bebfb6dbfe339ec65951128c9 (patch) | |
| tree | a371e6a0fb4289e4af98ce32a69f106e46e5797c | |
| parent | 9f7107cbc233b5947b3b0712290c546c21b52577 (diff) | |
| parent | f6dd06b536c238f448e10ea65e8fe7a1620157ee (diff) | |
| download | tt-rss-android-9a7329c767dc855bebfb6dbfe339ec65951128c9.tar.gz tt-rss-android-9a7329c767dc855bebfb6dbfe339ec65951128c9.tar.xz | |
Merge branch 'dev' into 'master' 26.02-9a7329c7-signed
stop registering flavor image in video gallery fragment for context menu as it... See merge request git/tt-rss/tt-rss-android!61
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 22 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java | 3 |
2 files changed, 11 insertions, 14 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 efee81b4..86b3bc14 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,15 +337,15 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc } protected Intent getShareIntent(String text, String subject) { - Intent shareIntent = new Intent(Intent.ACTION_SEND); - shareIntent.setType("text/plain"); - shareIntent.putExtra(Intent.EXTRA_TEXT, text); + Intent sendIntent = new Intent(Intent.ACTION_SEND); + sendIntent.setType("text/plain"); + sendIntent.putExtra(Intent.EXTRA_TEXT, text); if (subject != null) { - shareIntent.putExtra(Intent.EXTRA_SUBJECT, subject); + sendIntent.putExtra(Intent.EXTRA_SUBJECT, subject); } - return shareIntent; + return Intent.createChooser(sendIntent, null); } protected void shareText(String text) { @@ -381,14 +381,14 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc stream.close(); Uri shareUri = FileProvider.getUriForFile(CommonActivity.this, - "org.fox.ttrss.SharedFileProvider", file); + getPackageName() + ".SharedFileProvider", file); - Intent intent = new Intent(android.content.Intent.ACTION_SEND); - intent.putExtra(Intent.EXTRA_STREAM, shareUri); - intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - intent.setType("image/png"); + Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_STREAM, shareUri); + sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + sendIntent.setType("image/png"); - startActivity(intent); + startActivity(Intent.createChooser(sendIntent, null)); } catch (Exception e) { e.printStackTrace(); 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 b95e26f5..fc206543 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 @@ -50,11 +50,8 @@ public class GalleryVideoFragment extends GalleryBaseFragment { Log.d(TAG, "called for URL: " + m_url + " Cover: " + m_coverUrl); ImageView imgView = view.findViewById(R.id.flavor_image); - ViewCompat.setTransitionName(imgView, "gallery:" + m_url); - registerForContextMenu(imgView); - // ActivityCompat.startPostponedEnterTransition(m_activity); view.findViewById(R.id.flavor_image_progress).setVisibility(View.VISIBLE); |
