diff --git a/appveyor.yml b/appveyor.yml index 509f026a1..2292dff40 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,6 +9,7 @@ after_build: - IF DEFINED keystore_dec_secret secure-file\tools\secure-file -decrypt src\Android\8bit.keystore.enc -secret %keystore_dec_secret% - IF DEFINED keystore_password msbuild "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=%keystore_password%" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=%keystore_password%" "src\Android\Android.csproj" - ps: IF($env:keystore_dec_secret) { copy-item src\Android\bin\Release\com.x8bit.bitwarden-Signed.apk .\com.x8bit.bitwarden-$($env:APPVEYOR_BUILD_NUMBER).apk } + - ps: IF($env:keystore_dec_secret) { .\src\Android\fdroid-remove-libs.ps1 $($env:APPVEYOR_BUILD_FOLDER) } - IF DEFINED keystore_password msbuild "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=%keystore_password%" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=%keystore_password%" "src\Android\Android.csproj" - ps: IF($env:keystore_dec_secret) { copy-item src\Android\bin\FDroid\com.x8bit.bitwarden-Signed.apk .\com.x8bit.bitwarden-fdroid-$($env:APPVEYOR_BUILD_NUMBER).apk } on_success: diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index fb49ee76e..b60a83b45 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -155,6 +155,7 @@ + @@ -872,6 +873,12 @@ + + 42.1021.1 + + + 42.1021.1 + 4.0.12 @@ -882,14 +889,6 @@ - - - 42.1021.1 - - - 42.1021.1 - - diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index c937e355e..3ffd358ea 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -6475,17 +6475,17 @@ namespace Bit.Android // aapt resource value: 0x7f090051 public const int ApplicationName = 2131296337; - // aapt resource value: 0x7f0900b2 - public const int AutoFillServiceDescription = 2131296434; + // aapt resource value: 0x7f0900ab + public const int AutoFillServiceDescription = 2131296427; - // aapt resource value: 0x7f0900b1 - public const int AutoFillServiceSummary = 2131296433; + // aapt resource value: 0x7f0900aa + public const int AutoFillServiceSummary = 2131296426; // aapt resource value: 0x7f090050 public const int Hello = 2131296336; - // aapt resource value: 0x7f0900b3 - public const int MyVault = 2131296435; + // aapt resource value: 0x7f0900ac + public const int MyVault = 2131296428; // aapt resource value: 0x7f090027 public const int abc_action_bar_home_description = 2131296295; @@ -6640,27 +6640,6 @@ namespace Bit.Android // aapt resource value: 0x7f09000f public const int common_signin_button_text_long = 2131296271; - // aapt resource value: 0x7f0900ac - public const int default_web_client_id = 2131296428; - - // aapt resource value: 0x7f0900ad - public const int firebase_database_url = 2131296429; - - // aapt resource value: 0x7f0900aa - public const int gcm_defaultSenderId = 2131296426; - - // aapt resource value: 0x7f0900ae - public const int google_api_key = 2131296430; - - // aapt resource value: 0x7f0900ab - public const int google_app_id = 2131296427; - - // aapt resource value: 0x7f0900af - public const int google_crash_reporting_api_key = 2131296431; - - // aapt resource value: 0x7f0900b0 - public const int google_storage_bucket = 2131296432; - // aapt resource value: 0x7f090052 public const int hockeyapp_crash_dialog_app_name_fallback = 2131296338; diff --git a/src/Android/fdroid-remove-libs.ps1 b/src/Android/fdroid-remove-libs.ps1 new file mode 100644 index 000000000..29279b1cd --- /dev/null +++ b/src/Android/fdroid-remove-libs.ps1 @@ -0,0 +1,27 @@ +$rootPath = $args[0]; + +# Android.csproj + +$xml=New-Object XML; +$xml.Load($rootPath + "\src\Android\Android.csproj"); + +$ns=New-Object System.Xml.XmlNamespaceManager($xml.NameTable); +$ns.AddNamespace("ns", $xml.DocumentElement.NamespaceURI); + +$firebaseNode=$xml.SelectSingleNode("/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.Firebase.Messaging']", $ns); +$firebaseNode.ParentNode.RemoveChild($firebaseNode); + +$playServiceNode=$xml.SelectSingleNode("/ns:Project/ns:ItemGroup/ns:PackageReference[@Include='Xamarin.GooglePlayServices.Analytics']", $ns); +$playServiceNode.ParentNode.RemoveChild($playServiceNode); + +$xml.Save($rootPath + "\src\Android\Android.csproj"); + +# App.csproj + +$xml=New-Object XML; +$xml.Load($rootPath + "\src\App\App.csproj"); + +$hockeyNode=$xml.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='HockeySDK.Xamarin']"); +$hockeyNode.ParentNode.RemoveChild($hockeyNode); + +$xml.Save($rootPath + "\src\App\App.csproj"); diff --git a/src/App/App.csproj b/src/App/App.csproj index 67813faa7..8d8f07770 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -25,6 +25,7 @@ + @@ -39,10 +40,6 @@ - - - - AppResources.cs.resx