From bb37bac620e99ec6a117170e64015edecf37d39d Mon Sep 17 00:00:00 2001
From: Jacob Fink <jfink@bitwarden.com>
Date: Tue, 15 Feb 2022 13:36:32 -0500
Subject: [PATCH] Revert config files from previous commit

This reverts commit b02c58e3623781ada1e9e8f820b403a5c48274aa.
---
 src/Android/Properties/AndroidManifest.xml | 103 +++++++++++----------
 src/App/App.csproj                         |  10 +-
 src/iOS.Core/Info.plist                    |   5 -
 src/iOS.Core/iOS.Core.csproj               |   3 -
 4 files changed, 57 insertions(+), 64 deletions(-)
 delete mode 100644 src/iOS.Core/Info.plist

diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml
index 62e056bf9..0f6dd1eff 100644
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -1,48 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2.15.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.NFC" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.CAMERA" />
-	<uses-permission android:name="android.permission.USE_FINGERPRINT" />
-	<uses-permission android:name="android.permission.USE_BIOMETRIC" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-	<uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
-	<uses-feature android:name="android.hardware.camera" android:required="false" />
-	<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-	<application android:label="Bitwarden" android:theme="@style/LaunchTheme" android:allowBackup="false" tools:replace="android:allowBackup" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:networkSecurityConfig="@xml/network_security_config">
-		<provider android:name="androidx.core.content.FileProvider" android:authorities="com.x8bit.bitwarden.fileprovider" android:exported="false" android:grantUriPermissions="true">
-			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/filepaths" />
-		</provider>
-		<meta-data android:name="android.max_aspect" android:value="2.1" />
-		<meta-data android:name="android.content.APP_RESTRICTIONS" android:resource="@xml/app_restrictions" />
-		<!-- Support for Samsung "Multi Window" mode (for Android < 7.0 users) -->
-		<meta-data android:name="com.samsung.android.sdk.multiwindow.enable" android:value="true" />
-		<meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true" />
-		<!-- Support for LG "Dual Window" mode (for Android < 7.0 users) -->
-		<meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true" />
-		<!-- Declare MainActivity manually so we can set LaunchMode using API dependant resource -->
-		<activity android:name="com.x8bit.bitwarden.MainActivity" android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|uiMode" android:exported="true" android:icon="@mipmap/ic_launcher" android:label="Bitwarden" android:launchMode="@integer/launchModeAPIlevel" android:theme="@style/LaunchTheme">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.SEND" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<data android:mimeType="application/*" />
-				<data android:mimeType="image/*" />
-				<data android:mimeType="video/*" />
-				<data android:mimeType="text/*" />
-			</intent-filter>
-		</activity>
-	</application>
-	<!-- Package visibility (for Android 11+) -->
-	<queries>
-		<intent>
-			<action android:name="*" />
-		</intent>
-	</queries>
-</manifest>
\ No newline at end of file
+
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
+
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.NFC"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.CAMERA"/>
+  <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+  <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+  <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY"/>
+
+  <uses-feature android:name="android.hardware.camera" android:required="false"/>
+  <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+
+  <application android:label="Bitwarden" android:theme="@style/LaunchTheme" android:allowBackup="false" tools:replace="android:allowBackup" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:networkSecurityConfig="@xml/network_security_config">
+    <provider android:name="androidx.core.content.FileProvider" android:authorities="com.x8bit.bitwarden.fileprovider" android:exported="false" android:grantUriPermissions="true">
+      <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/filepaths"/>
+    </provider>
+
+    <meta-data android:name="android.max_aspect" android:value="2.1"/>
+    <meta-data android:name="android.content.APP_RESTRICTIONS" android:resource="@xml/app_restrictions"/>
+
+    <!-- Support for Samsung "Multi Window" mode (for Android < 7.0 users) -->
+    <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" android:value="true"/>
+    <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true"/>
+
+    <!-- Support for LG "Dual Window" mode (for Android < 7.0 users) -->
+    <meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true"/>
+	<!-- Declare MainActivity manually so we can set LaunchMode using API dependant resource -->
+	<activity android:name="com.x8bit.bitwarden.MainActivity" android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|uiMode" android:exported="true" android:icon="@mipmap/ic_launcher" android:label="Bitwarden" android:launchMode="@integer/launchModeAPIlevel" android:theme="@style/LaunchTheme">
+	  <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+		<category android:name="android.intent.category.LAUNCHER"/>
+	  </intent-filter>
+	  <intent-filter>
+	    <action android:name="android.intent.action.SEND"/>
+		<category android:name="android.intent.category.DEFAULT"/>
+		<data android:mimeType="application/*"/>
+		<data android:mimeType="image/*"/>
+		<data android:mimeType="video/*"/>
+		<data android:mimeType="text/*"/>
+	  </intent-filter>
+	</activity>
+  </application>
+
+  <!-- Package visibility (for Android 11+) -->
+  <queries>
+    <intent>
+      <action android:name="*"/>
+    </intent>
+  </queries>
+
+</manifest>
diff --git a/src/App/App.csproj b/src/App/App.csproj
index a75bc0237..98b0bb886 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -120,19 +120,12 @@
       <DependentUpon>SendGroupingsPage.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Pages\Authenticator\GeneratorPage.xaml.cs">
-      <DependentUpon>GeneratorPage.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Pages\Authenticator\AuthenticatorPage.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Resources\" />
     <Folder Include="Behaviors\" />
-    <Folder Include="Pages\Authenticator\" />
+      <Folder Include="Pages\Authenticator\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -422,6 +415,5 @@
 
   <ItemGroup>
     <None Remove="Behaviors\" />
-    <None Remove="Pages\Authenticator\" />
   </ItemGroup>
 </Project>
diff --git a/src/iOS.Core/Info.plist b/src/iOS.Core/Info.plist
deleted file mode 100644
index 0c67376eb..000000000
--- a/src/iOS.Core/Info.plist
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict/>
-</plist>
diff --git a/src/iOS.Core/iOS.Core.csproj b/src/iOS.Core/iOS.Core.csproj
index ee8d95ddf..a2353acf8 100644
--- a/src/iOS.Core/iOS.Core.csproj
+++ b/src/iOS.Core/iOS.Core.csproj
@@ -208,8 +208,5 @@
       <Version>2.0.3</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Info.plist" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file