From ef88386fc154cb85315c5095130a1e7b0e16dec5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Oct 2022 23:14:09 +0000
Subject: [PATCH 1/2] Bump sharetarget from 1.1.0 to 1.2.0

Bumps sharetarget from 1.1.0 to 1.2.0.

---
updated-dependencies:
- dependency-name: androidx.sharetarget:sharetarget
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector-app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 0e9d30b165..eb19027880 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -359,7 +359,7 @@ dependencies {
     debugImplementation project(':library:ui-styles')
     implementation libs.dagger.hilt
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "androidx.sharetarget:sharetarget:1.1.0"
+    implementation "androidx.sharetarget:sharetarget:1.2.0"
 
     // Flipper, debug builds only
     debugImplementation(libs.flipper.flipper) {

From b1d3cc85c23d74b3c869f4427a69113a6fd7fa26 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 Oct 2022 14:31:19 +0200
Subject: [PATCH 2/2] Remove the workaround, this is fixed in
 `androidx.sharetarget:sharetarget:1.2.0`. (with exported="true" declared in
 the library)
 https://android-review.googlesource.com/c/platform/frameworks/support/+/1742473

---
 vector-app/src/main/AndroidManifest.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml
index 2767b20404..7a515449b4 100644
--- a/vector-app/src/main/AndroidManifest.xml
+++ b/vector-app/src/main/AndroidManifest.xml
@@ -66,14 +66,6 @@
                 android:resource="@xml/sdk_provider_paths" />
         </provider>
 
-        <!-- Temporary fix for Android 12. android:exported has to be explicitly set when targeting Android 12
-        Do it for services coming from dependencies - BEGIN -->
-        <service
-            android:name="androidx.sharetarget.ChooserTargetServiceCompat"
-            android:exported="false"
-            tools:node="merge" />
-        <!-- Temporary fix for Android 12 change - END -->
-
     </application>
 
 </manifest>