From 83cc24e23bc4a6e70bd080154322adc1be798f3a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 3 Aug 2021 22:06:59 +0200
Subject: [PATCH] Fixed shortcut chooser

---
 app/src/amazon/AndroidManifest.xml | 7 ++++---
 app/src/fdroid/AndroidManifest.xml | 7 ++++---
 app/src/github/AndroidManifest.xml | 7 ++++---
 app/src/main/AndroidManifest.xml   | 7 ++++---
 app/src/play/AndroidManifest.xml   | 7 ++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 58bc635abf..de7d89a6c2 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -129,9 +129,6 @@
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -221,6 +218,10 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityView">
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 93a0a5d06c..d08b28453c 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -126,9 +126,6 @@
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -218,6 +215,10 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityView">
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 93a0a5d06c..d08b28453c 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -126,9 +126,6 @@
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -218,6 +215,10 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityView">
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 63ffe1d15f..bcab3ea81f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -129,9 +129,6 @@
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -246,6 +243,10 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityView">
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 27c513884c..203d0dd59c 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -127,9 +127,6 @@
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -219,6 +216,10 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityView">
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />