From 75f8592940e4882f5a8f9a2a1d671ff2a511f7a5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 4 Apr 2022 15:32:08 +0200
Subject: [PATCH] adding a couple more Android 12 related fixes

---
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              | 45 +++++++++++++++++--
 .../gallery/pro/helpers/MyWidgetProvider.kt   |  2 +-
 app/src/main/res/menu/cab_directories.xml     |  9 ++++
 app/src/main/res/menu/cab_media.xml           |  7 +++
 app/src/main/res/menu/menu_main.xml           | 10 +++++
 app/src/main/res/menu/menu_main_intent.xml    |  2 +
 app/src/main/res/menu/menu_media.xml          | 14 ++++++
 app/src/main/res/menu/menu_video_player.xml   |  1 +
 app/src/main/res/menu/menu_viewpager.xml      |  8 ++++
 app/src/main/res/menu/photo_video_menu.xml    |  2 +
 11 files changed, 97 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d294a7fae..3f133e5b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,7 +77,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:b16cc87e63'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:d8a0479340'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e47cb6be2..a1b58d9b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,10 +39,12 @@
 
         <activity
             android:name=".activities.SplashActivity"
+            android:exported="false"
             android:theme="@style/SplashTheme" />
 
         <activity
             android:name=".activities.MainActivity"
+            android:exported="true"
             android:resizeableActivity="true">
 
             <meta-data
@@ -78,6 +80,7 @@
 
         <activity
             android:name=".activities.MediaActivity"
+            android:exported="false"
             android:parentActivityName=".activities.MainActivity">
 
             <meta-data
@@ -92,6 +95,7 @@
 
         <activity
             android:name=".activities.SearchActivity"
+            android:exported="false"
             android:label="@string/search"
             android:parentActivityName=".activities.MainActivity"
             android:resizeableActivity="true">
@@ -108,6 +112,7 @@
         <activity
             android:name=".activities.ViewPagerActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="true"
             android:parentActivityName=".activities.MediaActivity">
 
             <intent-filter>
@@ -123,16 +128,19 @@
 
         <activity
             android:name="com.simplemobiletools.commons.activities.AboutActivity"
+            android:exported="false"
             android:label="@string/about"
             android:parentActivityName=".activities.MainActivity" />
 
         <activity
             android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
+            android:exported="false"
             android:label="@string/customize_colors"
             android:parentActivityName=".activities.SettingsActivity" />
 
         <activity
             android:name=".activities.SettingsActivity"
+            android:exported="true"
             android:label="@string/settings"
             android:parentActivityName=".activities.MainActivity">
 
@@ -144,41 +152,49 @@
 
         <activity
             android:name=".activities.PhotoVideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="false" />
 
         <activity
             android:name=".activities.VideoPlayerActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="false"
             android:parentActivityName=".activities.MediaActivity" />
 
         <activity
             android:name=".activities.PanoramaPhotoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="false"
             android:theme="@style/FullScreenTheme" />
 
         <activity
             android:name=".activities.PanoramaVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="false"
             android:theme="@style/FullScreenTheme" />
 
         <activity
             android:name=".activities.IncludedFoldersActivity"
+            android:exported="false"
             android:label="@string/include_folders"
             android:parentActivityName=".activities.SettingsActivity" />
 
         <activity
             android:name=".activities.ExcludedFoldersActivity"
+            android:exported="false"
             android:label="@string/excluded_folders"
             android:parentActivityName=".activities.SettingsActivity" />
 
         <activity
             android:name=".activities.HiddenFoldersActivity"
+            android:exported="false"
             android:label="@string/hidden_folders"
             android:parentActivityName=".activities.SettingsActivity" />
 
         <activity
             android:name=".activities.PhotoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize">
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -191,7 +207,8 @@
 
         <activity
             android:name=".activities.VideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize">
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -204,6 +221,7 @@
 
         <activity
             android:name=".activities.EditActivity"
+            android:exported="true"
             android:label="@string/editor">
 
             <intent-filter android:name="foss-editor">
@@ -230,6 +248,7 @@
 
         <activity
             android:name=".activities.SetWallpaperActivity"
+            android:exported="true"
             android:label="@string/simple_wallpaper">
             <intent-filter>
                 <action android:name="android.intent.action.ATTACH_DATA" />
@@ -248,6 +267,7 @@
 
         <activity
             android:name=".activities.WidgetConfigureActivity"
+            android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/MyWidgetConfigTheme">
             <intent-filter>
@@ -303,6 +323,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Red"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_red"
             android:roundIcon="@mipmap/ic_launcher_red"
             android:targetActivity=".activities.SplashActivity">
@@ -316,6 +337,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Pink"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_pink"
             android:roundIcon="@mipmap/ic_launcher_pink"
             android:targetActivity=".activities.SplashActivity">
@@ -329,6 +351,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Purple"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_purple"
             android:roundIcon="@mipmap/ic_launcher_purple"
             android:targetActivity=".activities.SplashActivity">
@@ -342,6 +365,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Deep_purple"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_deep_purple"
             android:roundIcon="@mipmap/ic_launcher_deep_purple"
             android:targetActivity=".activities.SplashActivity">
@@ -355,6 +379,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Indigo"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_indigo"
             android:roundIcon="@mipmap/ic_launcher_indigo"
             android:targetActivity=".activities.SplashActivity">
@@ -368,6 +393,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Blue"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_blue"
             android:roundIcon="@mipmap/ic_launcher_blue"
             android:targetActivity=".activities.SplashActivity">
@@ -381,6 +407,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Light_blue"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_light_blue"
             android:roundIcon="@mipmap/ic_launcher_light_blue"
             android:targetActivity=".activities.SplashActivity">
@@ -394,6 +421,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Cyan"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_cyan"
             android:roundIcon="@mipmap/ic_launcher_cyan"
             android:targetActivity=".activities.SplashActivity">
@@ -407,6 +435,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Teal"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_teal"
             android:roundIcon="@mipmap/ic_launcher_teal"
             android:targetActivity=".activities.SplashActivity">
@@ -420,6 +449,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Green"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_green"
             android:roundIcon="@mipmap/ic_launcher_green"
             android:targetActivity=".activities.SplashActivity">
@@ -433,6 +463,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Light_green"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_light_green"
             android:roundIcon="@mipmap/ic_launcher_light_green"
             android:targetActivity=".activities.SplashActivity">
@@ -446,6 +477,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Lime"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_lime"
             android:roundIcon="@mipmap/ic_launcher_lime"
             android:targetActivity=".activities.SplashActivity">
@@ -459,6 +491,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Yellow"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_yellow"
             android:roundIcon="@mipmap/ic_launcher_yellow"
             android:targetActivity=".activities.SplashActivity">
@@ -472,6 +505,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Amber"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_amber"
             android:roundIcon="@mipmap/ic_launcher_amber"
             android:targetActivity=".activities.SplashActivity">
@@ -485,6 +519,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Orange"
             android:enabled="true"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:roundIcon="@mipmap/ic_launcher"
             android:targetActivity=".activities.SplashActivity">
@@ -497,6 +532,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Deep_orange"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_deep_orange"
             android:roundIcon="@mipmap/ic_launcher_deep_orange"
             android:targetActivity=".activities.SplashActivity">
@@ -510,6 +546,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Brown"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_brown"
             android:roundIcon="@mipmap/ic_launcher_brown"
             android:targetActivity=".activities.SplashActivity">
@@ -523,6 +560,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Blue_grey"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_blue_grey"
             android:roundIcon="@mipmap/ic_launcher_blue_grey"
             android:targetActivity=".activities.SplashActivity">
@@ -536,6 +574,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Grey_black"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_grey_black"
             android:roundIcon="@mipmap/ic_launcher_grey_black"
             android:targetActivity=".activities.SplashActivity">
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MyWidgetProvider.kt
index f2e1b3d02..2f96015f7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MyWidgetProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MyWidgetProvider.kt
@@ -29,7 +29,7 @@ class MyWidgetProvider : AppWidgetProvider() {
             putExtra(DIRECTORY, widget.folderPath)
         }
 
-        val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
         views.setOnClickPendingIntent(id, pendingIntent)
     }
 
diff --git a/app/src/main/res/menu/cab_directories.xml b/app/src/main/res/menu/cab_directories.xml
index 04590cd9d..338444fa1 100644
--- a/app/src/main/res/menu/cab_directories.xml
+++ b/app/src/main/res/menu/cab_directories.xml
@@ -53,38 +53,47 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/cab_copy_to"
+        android:showAsAction="never"
         android:title="@string/copy_to"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_move_to"
+        android:showAsAction="never"
         android:title="@string/move_to"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_create_shortcut"
+        android:showAsAction="never"
         android:title="@string/create_shortcut"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_empty_recycle_bin"
+        android:showAsAction="never"
         android:title="@string/empty_recycle_bin"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_empty_disable_recycle_bin"
+        android:showAsAction="never"
         android:title="@string/empty_and_disable_recycle_bin"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_exclude"
+        android:showAsAction="never"
         android:title="@string/exclude"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_lock"
+        android:showAsAction="never"
         android:title="@string/lock_folder"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_unlock"
+        android:showAsAction="never"
         android:title="@string/unlock_folder"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_change_cover_image"
+        android:showAsAction="never"
         android:title="@string/change_cover_image"
         app:showAsAction="never">
         <menu>
diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml
index 4d78fae54..0b9b748cf 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -55,22 +55,27 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/cab_copy_to"
+        android:showAsAction="never"
         android:title="@string/copy_to"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_move_to"
+        android:showAsAction="never"
         android:title="@string/move_to"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_create_shortcut"
+        android:showAsAction="never"
         android:title="@string/create_shortcut"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_open_with"
+        android:showAsAction="never"
         android:title="@string/open_with"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_set_as"
+        android:showAsAction="never"
         android:title="@string/set_as"
         app:showAsAction="never" />
     <item
@@ -90,10 +95,12 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/cab_restore_recycle_bin_files"
+        android:showAsAction="never"
         android:title="@string/restore_selected_files"
         app:showAsAction="never" />
     <item
         android:id="@+id/cab_fix_date_taken"
+        android:showAsAction="never"
         android:title="@string/fix_date_taken"
         app:showAsAction="never" />
     <item
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index b692552fe..dfc0d0cd5 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -24,42 +24,52 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/change_view_type"
+        android:showAsAction="never"
         android:title="@string/change_view_type"
         app:showAsAction="never" />
     <item
         android:id="@+id/temporarily_show_hidden"
+        android:showAsAction="never"
         android:title="@string/temporarily_show_hidden"
         app:showAsAction="never" />
     <item
         android:id="@+id/stop_showing_hidden"
+        android:showAsAction="never"
         android:title="@string/stop_showing_hidden"
         app:showAsAction="never" />
     <item
         android:id="@+id/show_all"
+        android:showAsAction="never"
         android:title="@string/show_all"
         app:showAsAction="never" />
     <item
         android:id="@+id/show_the_recycle_bin"
+        android:showAsAction="never"
         android:title="@string/show_the_recycle_bin"
         app:showAsAction="never" />
     <item
         android:id="@+id/hide_the_recycle_bin"
+        android:showAsAction="never"
         android:title="@string/hide_the_recycle_bin"
         app:showAsAction="never" />
     <item
         android:id="@+id/set_as_default_folder"
+        android:showAsAction="never"
         android:title="@string/set_as_default_folder"
         app:showAsAction="never" />
     <item
         android:id="@+id/create_new_folder"
+        android:showAsAction="never"
         android:title="@string/create_new_folder"
         app:showAsAction="never" />
     <item
         android:id="@+id/increase_column_count"
+        android:showAsAction="never"
         android:title="@string/increase_column_count"
         app:showAsAction="never" />
     <item
         android:id="@+id/reduce_column_count"
+        android:showAsAction="never"
         android:title="@string/reduce_column_count"
         app:showAsAction="never" />
     <item
diff --git a/app/src/main/res/menu/menu_main_intent.xml b/app/src/main/res/menu/menu_main_intent.xml
index 18ad227a6..3c1bcd90e 100644
--- a/app/src/main/res/menu/menu_main_intent.xml
+++ b/app/src/main/res/menu/menu_main_intent.xml
@@ -3,10 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/temporarily_show_hidden"
+        android:showAsAction="never"
         android:title="@string/temporarily_show_hidden"
         app:showAsAction="never" />
     <item
         android:id="@+id/stop_showing_hidden"
+        android:showAsAction="never"
         android:title="@string/stop_showing_hidden"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml
index 346d810c6..377e7a665 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -24,30 +24,37 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/change_view_type"
+        android:showAsAction="never"
         android:title="@string/change_view_type"
         app:showAsAction="never" />
     <item
         android:id="@+id/temporarily_show_hidden"
+        android:showAsAction="never"
         android:title="@string/temporarily_show_hidden"
         app:showAsAction="never" />
     <item
         android:id="@+id/stop_showing_hidden"
+        android:showAsAction="never"
         android:title="@string/stop_showing_hidden"
         app:showAsAction="never" />
     <item
         android:id="@+id/empty_recycle_bin"
+        android:showAsAction="never"
         android:title="@string/empty_recycle_bin"
         app:showAsAction="never" />
     <item
         android:id="@+id/empty_disable_recycle_bin"
+        android:showAsAction="never"
         android:title="@string/empty_and_disable_recycle_bin"
         app:showAsAction="never" />
     <item
         android:id="@+id/restore_all_files"
+        android:showAsAction="never"
         android:title="@string/restore_all_files"
         app:showAsAction="never" />
     <item
         android:id="@+id/folder_view"
+        android:showAsAction="never"
         android:title="@string/folder_view"
         app:showAsAction="never" />
     <item
@@ -57,30 +64,37 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/group"
+        android:showAsAction="never"
         android:title="@string/group_by"
         app:showAsAction="never" />
     <item
         android:id="@+id/set_as_default_folder"
+        android:showAsAction="never"
         android:title="@string/set_as_default_folder"
         app:showAsAction="never" />
     <item
         android:id="@+id/unset_as_default_folder"
+        android:showAsAction="never"
         android:title="@string/unset_as_default_folder"
         app:showAsAction="never" />
     <item
         android:id="@+id/create_new_folder"
+        android:showAsAction="never"
         android:title="@string/create_new_folder"
         app:showAsAction="never" />
     <item
         android:id="@+id/increase_column_count"
+        android:showAsAction="never"
         android:title="@string/increase_column_count"
         app:showAsAction="never" />
     <item
         android:id="@+id/reduce_column_count"
+        android:showAsAction="never"
         android:title="@string/reduce_column_count"
         app:showAsAction="never" />
     <item
         android:id="@+id/slideshow"
+        android:showAsAction="never"
         android:title="@string/slideshow"
         app:showAsAction="never" />
     <item
diff --git a/app/src/main/res/menu/menu_video_player.xml b/app/src/main/res/menu/menu_video_player.xml
index 86b92e808..e4c08a500 100644
--- a/app/src/main/res/menu/menu_video_player.xml
+++ b/app/src/main/res/menu/menu_video_player.xml
@@ -13,6 +13,7 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_open_with"
+        android:showAsAction="never"
         android:title="@string/open_with"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/menu_viewpager.xml b/app/src/main/res/menu/menu_viewpager.xml
index cdaa76c7d..c05c56bff 100644
--- a/app/src/main/res/menu/menu_viewpager.xml
+++ b/app/src/main/res/menu/menu_viewpager.xml
@@ -56,18 +56,22 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_copy_to"
+        android:showAsAction="never"
         android:title="@string/copy_to"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_move_to"
+        android:showAsAction="never"
         android:title="@string/move_to"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_create_shortcut"
+        android:showAsAction="never"
         android:title="@string/create_shortcut"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_open_with"
+        android:showAsAction="never"
         android:title="@string/open_with"
         app:showAsAction="never" />
     <item
@@ -92,6 +96,7 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_restore_file"
+        android:showAsAction="never"
         android:title="@string/restore_this_file"
         app:showAsAction="never" />
     <item
@@ -113,14 +118,17 @@
     </item>
     <item
         android:id="@+id/menu_print"
+        android:showAsAction="never"
         android:title="@string/print"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_resize"
+        android:showAsAction="never"
         android:title="@string/resize"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_show_on_map"
+        android:showAsAction="never"
         android:title="@string/show_on_map"
         app:showAsAction="never" />
     <item
diff --git a/app/src/main/res/menu/photo_video_menu.xml b/app/src/main/res/menu/photo_video_menu.xml
index 2cafe7c50..066b405d7 100644
--- a/app/src/main/res/menu/photo_video_menu.xml
+++ b/app/src/main/res/menu/photo_video_menu.xml
@@ -23,10 +23,12 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_open_with"
+        android:showAsAction="never"
         android:title="@string/open_with"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_show_on_map"
+        android:showAsAction="never"
         android:title="@string/show_on_map"
         app:showAsAction="never" />
 </menu>