Skip to content

Commit 2485621

Browse files
SimizfoSimizfo
committed
Bug Fixes
1 parent fce7f70 commit 2485621

File tree

9 files changed

+41
-43
lines changed

9 files changed

+41
-43
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.vs
22
packages
3+
releases
34
PreparedInstaller/files
45
WoADialer/AppPackages
56
WoADialer/BundleArtifacts

‎PreparedInstaller/install.bat‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
1+
@echo off
2+
echo WoADialer created by Simone Franco @simizfo
3+
echo for the WoALumia Project.
4+
echo ------
5+
echo This setup will install the WoADialer UWP App
6+
echo the background app and the required files.
7+
echo Confirm now, or close this console window.
8+
pause
9+
10+
net session >nul 2>&1
11+
if %errorLevel% == 0 (
12+
echo Administrator permissions found...
13+
) else (
14+
echo You need to run this tool as administrator.
15+
pause
16+
exit
17+
)
18+
19+
echo Copying needed files...
120
echo F | xcopy %~dp0\files\WoADialerHelper.exe C:\Windows\System32\WoADialerHelper.exe /O /X /H /K /F
21+
echo Adding registry keys...
222
regedit /S %~dp0\files\regkeys.reg
23+
echo Installing WoADialer UWP App...
324
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& {Start-Process PowerShell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -File ""%~dp0\files\woadialer\Add-AppDevPackage.ps1""' -Verb RunAs}"
4-
schtasks.exe /Create -tn "WoADialerTask" /XML files\WoADialerTask.xml
25+
echo Creating the background task...
26+
schtasks.exe /Create -tn "WoADialerTask" /XML %~dp0\files\WoADialerTask.xml
27+
echo Completed! Enjoy WoADialer!
528
pause

‎WoADialer.sln‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ VisualStudioVersion = 16.0.28803.352
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WoADialer", "WoADialer\WoADialer.csproj", "{51BB3779-D2B9-49B5-AF9D-9838E114A869}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WoADialerHelper", "WoADialerHelper2\WoADialerHelper.csproj", "{643BBA73-1864-41C9-B27F-508835B0C9F2}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WoADialerInstaller", "WoADialerInstaller\WoADialerInstaller.csproj", "{833E93AA-8F70-477A-A8A2-369A8DA8E500}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WoADialerHelper", "WoADialerHelper\WoADialerHelper.csproj", "{643BBA73-1864-41C9-B27F-508835B0C9F2}"
119
EndProject
1210
Global
1311
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -69,26 +67,6 @@ Global
6967
{643BBA73-1864-41C9-B27F-508835B0C9F2}.Release|x64.Build.0 = Release|Any CPU
7068
{643BBA73-1864-41C9-B27F-508835B0C9F2}.Release|x86.ActiveCfg = Release|Any CPU
7169
{643BBA73-1864-41C9-B27F-508835B0C9F2}.Release|x86.Build.0 = Release|Any CPU
72-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|Any CPU.Build.0 = Debug|Any CPU
74-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|ARM.ActiveCfg = Debug|Any CPU
75-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|ARM.Build.0 = Debug|Any CPU
76-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|ARM64.ActiveCfg = Debug|Any CPU
77-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|ARM64.Build.0 = Debug|Any CPU
78-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|x64.ActiveCfg = Debug|Any CPU
79-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|x64.Build.0 = Debug|Any CPU
80-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|x86.ActiveCfg = Debug|Any CPU
81-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Debug|x86.Build.0 = Debug|Any CPU
82-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|Any CPU.ActiveCfg = Release|Any CPU
83-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|Any CPU.Build.0 = Release|Any CPU
84-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|ARM.ActiveCfg = Release|Any CPU
85-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|ARM.Build.0 = Release|Any CPU
86-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|ARM64.ActiveCfg = Release|Any CPU
87-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|ARM64.Build.0 = Release|Any CPU
88-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|x64.ActiveCfg = Release|Any CPU
89-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|x64.Build.0 = Release|Any CPU
90-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|x86.ActiveCfg = Release|Any CPU
91-
{833E93AA-8F70-477A-A8A2-369A8DA8E500}.Release|x86.Build.0 = Release|Any CPU
9270
EndGlobalSection
9371
GlobalSection(SolutionProperties) = preSolution
9472
HideSolutionNode = FALSE

‎WoADialer/MainPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Button x:Name="deleteLastNumberButton" Background="Transparent" Click="DeleteLastNumberButton_Click" FontFamily="Segoe MDL2 Assets" Content="" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0, 10, 10, 0" Height="40" Width="40"></Button>
1414
<TextBlock x:Name="callStateIndicatorText" Opacity="0.3" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10, 55, 0, 0">AAAA</TextBlock>
1515
<Button x:Name="callButton" Content="Call" Style="{StaticResource ButtonRevealStyle}" Background="{ThemeResource SystemAccentColorDark1}" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" Height="100" Click="CallButton_Click"></Button>
16-
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0, 80, 0, 100">
16+
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="0, 80, 0, 100" MaxHeight="600">
1717
<Grid.RowDefinitions>
1818
<RowDefinition Height="1*"/>
1919
<RowDefinition Height="1*"/>

‎WoADialer/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Identity
1313
Name="1e17ea40-87af-45e2-865a-c2bd98036a67"
1414
Publisher="CN=ratch"
15-
Version="0.1.3.0" />
15+
Version="0.1.4.0" />
1616

1717
<mp:PhoneIdentity PhoneProductId="1e17ea40-87af-45e2-865a-c2bd98036a67" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1818

‎WoADialer/Pages/InCallUI.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<TextBlock x:Name="callerNumberText" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20, 50, 0, 0" Text="[callerNumber]"></TextBlock>
1414
<TextBlock x:Name="callStatusText" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20, 80, 0, 0" Text="[callStatus]"></TextBlock>
1515
<TextBlock x:Name="callTimerText" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20, 110, 0, 0" Text="[callLength]"></TextBlock>
16-
<Button x:Name="speakerOutputButton" Style="{StaticResource ButtonRevealStyle}" Content="Speaker" Width="100" Height="100" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="0, 0, 0, 100"></Button>
16+
<Button x:Name="speakerOutputButton" Style="{StaticResource ButtonRevealStyle}" Content="Speaker" Width="100" Height="100" Visibility="Collapsed" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="0, 0, 0, 100"></Button>
1717
<Button x:Name="closeCallButton" Content="Close" Style="{StaticResource ButtonRevealStyle}" Background="{ThemeResource SystemAccentColorDark1}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="100" Click="CloseCallButton_Click"></Button>
1818
</Grid>
1919
</Page>

‎WoADialer/WoADialer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
2323
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
2424
<AppxBundle>Always</AppxBundle>
25-
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
25+
<AppxBundlePlatforms>arm64</AppxBundlePlatforms>
2626
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
2727
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
2828
<PackageCertificateThumbprint>4206F61A3982332CCB29FD45B4A4783BA7E590A8</PackageCertificateThumbprint>

‎WoADialer/WoADialer.csproj.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PropertyGroup>
1313
<UapAppxPackageBuildMode>SideloadOnly</UapAppxPackageBuildMode>
1414
<AppxShowAllApps>False</AppxShowAllApps>
15-
<AppxBuildConfigurationSelection>x64</AppxBuildConfigurationSelection>
15+
<AppxBuildConfigurationSelection>arm64</AppxBuildConfigurationSelection>
1616
<PackageOptionalProjectsInIdeBuilds>False</PackageOptionalProjectsInIdeBuilds>
1717
</PropertyGroup>
1818
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">

‎WoADialerHelper/Program.cs‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
using Microsoft.Win32;
2-
using System;
3-
using System.Collections.Generic;
1+
using System;
42
using System.Diagnostics;
5-
using System.Linq;
63
using System.ServiceProcess;
7-
using System.Text;
8-
using System.Threading.Tasks;
4+
using System.Threading;
95
using Windows.ApplicationModel.Calls;
106

117

@@ -22,17 +18,17 @@ static void Main(string[] args)
2218
else
2319
{
2420
Console.WriteLine("Running parameters mode...");
25-
for(int i = 0; i < args.Length; i++)
26-
{
27-
Console.WriteLine("Arg " + i + " = " + args[i]);
28-
}
21+
for(int i = 0; i < args.Length; i++) Console.WriteLine("Arg " + i + " = " + args[i]);
2922
string command = args[0].Split(':')[1];
3023
if(command == "closecall")
3124
{
3225
ServiceController controller = new ServiceController("PhoneSvc");
33-
controller.Stop();
34-
controller.WaitForStatus(ServiceControllerStatus.Stopped);
35-
controller.Start();
26+
try
27+
{
28+
controller.Stop();
29+
controller.WaitForStatus(ServiceControllerStatus.Stopped);
30+
controller.Start();
31+
} catch (Exception e) { }
3632
}
3733
}
3834
}
@@ -63,7 +59,7 @@ public static void startListeningMode()
6359
}
6460
};
6561
Console.WriteLine("Call event bound!");
66-
while (true) ;
62+
Thread.Sleep(Timeout.Infinite);
6763
}
6864
}
6965
}

0 commit comments

Comments
 (0)