From 1ff340b0186941f9251f281743477035fdafca8e Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 3 Aug 2022 09:30:08 +0100
Subject: [PATCH] lifting the manifest provider references to the app module
 manifest

---
 vector-app/src/main/AndroidManifest.xml | 46 ++++++++++++++++++++++++-
 vector/build.gradle                     |  2 +-
 vector/src/main/AndroidManifest.xml     | 36 -------------------
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml
index 4f5f02f833..c6d9e9f934 100644
--- a/vector-app/src/main/AndroidManifest.xml
+++ b/vector-app/src/main/AndroidManifest.xml
@@ -1,2 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.application"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="im.vector.application">
+
+    <application>
+
+        <!-- Providers -->
+
+        <!-- Remove WorkManagerInitializer Provider because we are using on-demand initialization of WorkManager-->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+            <!-- We init the lib ourself in EmojiCompatWrapper -->
+            <meta-data
+                android:name="androidx.emoji2.text.EmojiCompatInitializer"
+                tools:node="remove" />
+        </provider>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                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>
diff --git a/vector/build.gradle b/vector/build.gradle
index ce513fd6ec..341c17ec12 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -164,7 +164,7 @@ dependencies {
     implementation libs.androidx.appCompat
     implementation libs.androidx.fragmentKtx
     implementation libs.androidx.constraintLayout
-    implementation "androidx.sharetarget:sharetarget:1.1.0"
+    api "androidx.sharetarget:sharetarget:1.1.0"
     implementation libs.androidx.core
     implementation "androidx.media:media:1.6.0"
     implementation "androidx.transition:transition:1.4.1"
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index ea62aa1b58..32a9c461b8 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -434,42 +434,6 @@
                 <action android:name="org.unifiedpush.android.connector.REGISTRATION_REFUSED" />
             </intent-filter>
         </receiver>
-
-        <!-- Providers -->
-
-        <!-- Remove WorkManagerInitializer Provider because we are using on-demand initialization of WorkManager-->
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-            <!-- We init the lib ourself in EmojiCompatWrapper -->
-            <meta-data
-                android:name="androidx.emoji2.text.EmojiCompatInitializer"
-                tools:node="remove" />
-        </provider>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                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>