From 615ab414ff8da84c5e740ef5832f39b17927ae8f Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Wed, 3 Aug 2022 14:56:46 +0100
Subject: [PATCH] moving imports around to match application/library split

---
 vector-app/build.gradle                                     | 2 ++
 vector-app/src/gplay/AndroidManifest.xml                    | 4 ++--
 vector-app/src/main/java/im/vector/app/VectorApplication.kt | 1 +
 vector/build.gradle                                         | 1 -
 vector/src/main/AndroidManifest.xml                         | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 289230e16c..162af61b15 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -345,5 +345,7 @@ dependencies {
     implementation project(':vector-config')
     implementation libs.dagger.hilt
     implementation 'androidx.multidex:multidex:2.0.1'
+    implementation "androidx.sharetarget:sharetarget:1.1.0"
+
     kapt libs.dagger.hiltCompiler
 }
diff --git a/vector-app/src/gplay/AndroidManifest.xml b/vector-app/src/gplay/AndroidManifest.xml
index 0d2bfeed53..bc74b9bb52 100755
--- a/vector-app/src/gplay/AndroidManifest.xml
+++ b/vector-app/src/gplay/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application android:name="im.vector.app.VectorApplication">
 
         <!-- Firebase components -->
         <meta-data
@@ -9,8 +9,8 @@
             android:value="true" />
 
         <receiver
+            android:name="im.vector.app.push.fcm.EmbeddedFCMDistributor"
             android:enabled="true"
-            android:name=".push.fcm.EmbeddedFCMDistributor"
             android:exported="false">
 
             <intent-filter>
diff --git a/vector-app/src/main/java/im/vector/app/VectorApplication.kt b/vector-app/src/main/java/im/vector/app/VectorApplication.kt
index e68df3bbce..ee04d908e8 100644
--- a/vector-app/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector-app/src/main/java/im/vector/app/VectorApplication.kt
@@ -66,6 +66,7 @@ import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.version.VersionProvider
+import im.vector.application.R
 import org.jitsi.meet.sdk.log.JitsiMeetDefaultLogHandler
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.AuthenticationService
diff --git a/vector/build.gradle b/vector/build.gradle
index 341c17ec12..0c335db4a7 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -164,7 +164,6 @@ dependencies {
     implementation libs.androidx.appCompat
     implementation libs.androidx.fragmentKtx
     implementation libs.androidx.constraintLayout
-    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 32a9c461b8..d24731887f 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <!-- Call feature -->
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
@@ -75,7 +76,6 @@
     </queries>
 
     <application
-        android:name=".VectorApplication"
         android:allowBackup="false"
         android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"