From 1d50bbdbda3ffd2804031b899e1b5bf74c70f634 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 12 Sep 2022 16:15:03 +0100
Subject: [PATCH] fixing manifest imports and giving androidTest its own
 dedicated manifest

---
 vector-app/src/debug/AndroidManifest.xml   | 2 --
 vector-app/src/fdroid/AndroidManifest.xml  | 6 +++---
 vector/src/androidTest/AndroidManifest.xml | 8 ++++++++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 vector/src/androidTest/AndroidManifest.xml

diff --git a/vector-app/src/debug/AndroidManifest.xml b/vector-app/src/debug/AndroidManifest.xml
index 3860a37319..a7867f4081 100644
--- a/vector-app/src/debug/AndroidManifest.xml
+++ b/vector-app/src/debug/AndroidManifest.xml
@@ -15,8 +15,6 @@
             android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
             android:exported="true" />
 
-        <!-- Used for UI tests to display the BiometricPrompt. It's normal that it appears as an error. -->
-        <activity android:exported="false" android:name=".features.pin.lockscreen.tests.LockScreenTestActivity" />
     </application>
 
 </manifest>
diff --git a/vector-app/src/fdroid/AndroidManifest.xml b/vector-app/src/fdroid/AndroidManifest.xml
index 65630590d2..354d450958 100644
--- a/vector-app/src/fdroid/AndroidManifest.xml
+++ b/vector-app/src/fdroid/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <application>
 
         <receiver
-            android:name=".fdroid.receiver.OnApplicationUpgradeOrRebootReceiver"
+            android:name="im.vector.app.fdroid.receiver.OnApplicationUpgradeOrRebootReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
@@ -23,12 +23,12 @@
         </receiver>
 
         <receiver
-            android:name=".fdroid.receiver.AlarmSyncBroadcastReceiver"
+            android:name="im.vector.app.fdroid.receiver.AlarmSyncBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
 
         <service
-            android:name=".fdroid.service.GuardAndroidService"
+            android:name="im.vector.app.fdroid.service.GuardAndroidService"
             android:exported="false"
             tools:ignore="Instantiatable" />
 
diff --git a/vector/src/androidTest/AndroidManifest.xml b/vector/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000000..002b12f0db
--- /dev/null
+++ b/vector/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity android:name=".features.pin.lockscreen.tests.LockScreenTestActivity" />
+    </application>
+
+</manifest>