Skip to content

Fix up ForegroundService.ToString() #8412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Fix up ForegroundService.ToString() #8412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a549544
Fix up ForegroundService.ToString()
dellis1972 Oct 10, 2023
3c18d6e
Fix
dellis1972 Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,33 @@ class TestActivity : Activity { }"
}
}

[Test]
[TestCase ("Android.Content.PM.ForegroundService.TypeSpecialUse", "specialUse")]
[TestCase ("Android.Content.PM.ForegroundService.TypeConnectedDevice", "connectedDevice")]
[TestCase ("Android.Content.PM.ForegroundService.TypeCamera|Android.Content.PM.ForegroundService.TypeMicrophone", "camera|microphone")]
public void AllForegroundServiceTypes (string serviceType, string expected)
{
var proj = new XamarinAndroidApplicationProject {
};

proj.Sources.Add (new BuildItem.Source ("TestActivity.cs") {
TextContent = () => $@"using Android.App;
using Android.Content.PM;
using Android.Views;
[Service (ForegroundServiceType = {serviceType})]
class TestService : Service {{ public override Android.OS.IBinder OnBind (Android.Content.Intent intent) {{ return null; }} }}"
});
using (ProjectBuilder builder = CreateApkBuilder (Path.Combine ("temp", TestName))) {
Assert.IsTrue (builder.Build (proj), "Build should have succeeded");
string manifest = builder.Output.GetIntermediaryAsText (Path.Combine ("android", "AndroidManifest.xml"));
var doc = XDocument.Parse (manifest);
var ns = XNamespace.Get ("http://schemas.android.com/apk/res/android");
IEnumerable<XElement> services = doc.Element ("manifest")?.Element ("application")?.Elements ("service");
XElement e = services.FirstOrDefault (x => x.Attribute (ns.GetName ("foregroundServiceType"))?.Value == expected);
Assert.IsNotNull (e, $"Manifest should contain an service with a foregroundServiceType of {expected}");
}
}

[Test]
public void AllServiceAttributeProperties ([Values ("legacy", "manifestmerger.jar")] string manifestMerger)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void AssertCommercialBuild (bool fail = false)
}
}

char [] invalidChars = { '{', '}', '(', ')', '$', ':', ';', '\"', '\'', ',', '=' };
char [] invalidChars = { '{', '}', '(', ')', '$', ':', ';', '\"', '\'', ',', '=', '|' };

public string TestName {
get {
Expand Down
22 changes: 18 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocumentElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,12 +383,26 @@ static string ToString (ForegroundService value)
values.Add ("mediaProjection");
if (value.HasFlag (ForegroundService.TypePhoneCall))
values.Add ("phoneCall");

// These can be changed to enum members when API-R is the stable binding.
if (value.HasFlag ((ForegroundService)64))
if (value.HasFlag (ForegroundService.TypeCamera))
values.Add ("camera");
if (value.HasFlag ((ForegroundService)128))
if (value.HasFlag (ForegroundService.TypeMicrophone))
values.Add ("microphone");
if (value.HasFlag (ForegroundService.TypeHealth))
values.Add ("health");
if (value.HasFlag (ForegroundService.TypeRemoteMessaging))
values.Add ("remoteMessaging");
if (value.HasFlag (ForegroundService.TypeSystemExempted))
values.Add ("systemExempted");
if (value.HasFlag (ForegroundService.TypeShortService))
values.Add ("shortService");
if (value.HasFlag (ForegroundService.TypeSpecialUse))
values.Add ("specialUse");

// When including a non-stable value you can cast the integer value
// to ForegroundService. We need to do this because the Build.Tasks
// only build against the latest STABLE api.
//if (value.HasFlag ((ForegroundService)128))
// values.Add ("newValue");

return string.Join ("|", values.ToArray ());
}
Expand Down