these are the changes the successfully build for android

btcpayserver · Mar 5, 2025 · adac5e3 · adac5e3
1 parent 9bf8430
commit adac5e3
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 24 deletions.
diff --git a/BTCPayApp.Core/BTCPayServer/BTCPayConnectionManager.cs b/BTCPayApp.Core/BTCPayServer/BTCPayConnectionManager.cs
@@ -117,7 +117,8 @@ await WrapInLock(async () =>
 
     private async Task OnConnectionChanged(object? sender, (BTCPayConnectionState Old, BTCPayConnectionState New) e)
     {
-        var deviceIdentifier = await secureProvider.GetDeviceIdentifier();
+        //I suspect this is failing to due a race condition
+        var deviceIdentifier = 0; //await secureProvider.GetDeviceIdentifier();
         var newState = e.New;
         try
         {

diff --git a/BTCPayApp.Maui/BTCPayApp.Maui.csproj b/BTCPayApp.Maui/BTCPayApp.Maui.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-ios;net8.0-android;</TargetFrameworks>
+    <TargetFrameworks>net8.0-android;</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux'))">net8.0-android;</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>BTCPayApp.Maui</RootNamespace>
@@ -14,7 +14,7 @@
     <ApplicationTitle>BTCPay Server</ApplicationTitle>
 
     <!-- App Identifier -->
-    <ApplicationId>org.btcpayserver.BTCPayApp</ApplicationId>
+    <ApplicationId>org.btcpayserver.BTCPayApp.test</ApplicationId>
     <ApplicationIdGuid>8DD71ACC-C78F-44AB-937A-6B3A19D7E78E</ApplicationIdGuid>
     <RunAOTCompilation>false</RunAOTCompilation>
 
@@ -55,40 +55,50 @@
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+    <DebugSymbols>False</DebugSymbols>
+    <AndroidKeyStore>False</AndroidKeyStore>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- App Icon -->
     <!-- Splash Screen -->
-    <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#FFFFFF"/>
+    <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#FFFFFF" />
     <!-- Images -->
-    <MauiImage Include="Resources\Images\*"/>
+    <MauiImage Include="Resources\Images\*" />
     <!-- Custom Fonts -->
-    <MauiFont Include="Resources\Fonts\*"/>
+    <MauiFont Include="Resources\Fonts\*" />
     <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
-    <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)"/>
+    <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj"/>
-    <ProjectReference Include="..\BTCPayApp.UI\BTCPayApp.UI.csproj"/>
-    <PackageReference Include="org.ldk" Version="0.0.123"/>
-    <PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1"/>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.100"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2"/>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.100"/>
-    <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.100"/>
+    <ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj" />
+    <ProjectReference Include="..\BTCPayApp.UI\BTCPayApp.UI.csproj" />
+    <PackageReference Include="org.ldk" Version="0.0.123" />
+    <PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.100" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.100" />
+    <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.100" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-    <Compile Remove="**\iOS\**\*.cs"/>
-    <None Include="**\iOS\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
+    <Compile Remove="**\iOS\**\*.cs" />
+    <None Include="**\iOS\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-    <Compile Remove="**\Android\**\*.cs"/>
-    <None Include="**\Android\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
-    <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.10"/>
-    <PackageReference Include="SQLitePCLRaw.core" Version="2.1.10"/>
-    <PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10"/>
-    <PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10"/>
+    <Compile Remove="**\Android\**\*.cs" />
+    <None Include="**\Android\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
+    <PackageReference Include="SQLitePCLRaw.core" Version="2.1.10" />
+    <PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10" />
+    <PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
   </ItemGroup>
 </Project>
diff --git a/BTCPayApp.sln b/BTCPayApp.sln
@@ -1,5 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35707.178 d17.12
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BTCPayApp.UI", "BTCPayApp.UI\BTCPayApp.UI.csproj", "{14A8EF70-7E90-4383-A0F3-7F041AD50173}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BTCPayApp.Server", "BTCPayApp.Server\BTCPayApp.Server.csproj", "{513ECA21-1606-4471-9490-82242B219051}"
@@ -48,8 +51,10 @@ Global
 		{513ECA21-1606-4471-9490-82242B219051}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1FF3372E-435B-4E4D-BBE1-0AB7D8835618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1FF3372E-435B-4E4D-BBE1-0AB7D8835618}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FF3372E-435B-4E4D-BBE1-0AB7D8835618}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{1FF3372E-435B-4E4D-BBE1-0AB7D8835618}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1FF3372E-435B-4E4D-BBE1-0AB7D8835618}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FF3372E-435B-4E4D-BBE1-0AB7D8835618}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{07DFC925-715E-4A7C-A18E-91949B9CA7F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07DFC925-715E-4A7C-A18E-91949B9CA7F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07DFC925-715E-4A7C-A18E-91949B9CA7F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -99,6 +104,9 @@ Global
 		{BC5E2FB2-EDF1-40F3-961F-562CE1080D95}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC5E2FB2-EDF1-40F3-961F-562CE1080D95}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2464FC73-75E8-4254-A900-2090FB4D1EDD} = {1F7B46F8-2965-48B8-B402-E69A157709C1}
 		{D1D88DD3-D388-4E26-8B57-C53745418139} = {1F7B46F8-2965-48B8-B402-E69A157709C1}

diff --git a/submodules/btcpayserver b/submodules/btcpayserver
+3 −3		BTCPayServer.Tests/BTCPayServer.Tests.csproj
+0 −227		BTCPayServer.Tests/FeatureTests/MultisigTests.cs
+1 −1		BTCPayServer/Controllers/UIStoresController.Onchain.cs
+4 −19		BTCPayServer/Controllers/UIWalletsController.PSBT.cs
+1 −1		BTCPayServer/Controllers/UIWalletsController.cs
+12 −32		BTCPayServer/HostedServices/PendingTransactionService.cs
+0 −1		BTCPayServer/Views/UIWallets/WalletPSBTDecoded.cshtml
+26 −12		BTCPayServer/Views/UIWallets/WalletTransactions.cshtml