Skip to content

Add support to discovering activity-alias activity elements #247

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 3 commits into from
Dec 3, 2024
Merged

Add support to discovering activity-alias activity elements #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d860bb
Add support to discovering activity-alias activity elements
dellis1972 Nov 26, 2024
cd29d7c
Fix up the code
dellis1972 Nov 26, 2024
c3b0112
ADd Unit Tests
dellis1972 Dec 3, 2024
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
4 changes: 3 additions & 1 deletion src/Xamarin.Android.Tools.AndroidSdk/AndroidAppManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,9 @@ void RemoveAndroidPermissions (IEnumerable<string> permissions)

IEnumerable<XElement> GetLaunchableActivities ()
{
foreach (var activity in application.Elements ("activity")) {
var activities = application.Elements ("activity");
var aliases = application.Elements ("activity-alias");
foreach (var activity in activities.Union (aliases)) {
foreach (var filter in activity.Elements ("intent-filter")) {
foreach (var category in filter.Elements ("category"))
if (category != null && (string?)category.Attribute (aName) == "android.intent.category.LAUNCHER")
Expand Down
3 changes: 2 additions & 1 deletion tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidAppManifestTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ public void GetLaunchableActivityNames ()
var versions = new AndroidVersions (Array.Empty<AndroidVersion>());
var manifest = AndroidAppManifest.Load (GetTestAppManifest (), versions);
var launchers = manifest.GetLaunchableActivityNames ().ToList ();
Assert.AreEqual (1, launchers.Count);
Assert.AreEqual (2, launchers.Count);
Assert.AreEqual (".HasMultipleIntentFilters", launchers [0]);
Assert.AreEqual (".ActivityAlias", launchers [1]);
}

[Test]
Expand Down
6 changes: 6 additions & 0 deletions tests/Xamarin.Android.Tools.AndroidSdk-Tests/Resources/manifest-simplewidget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity-alias android:name=".ActivityAlias" android:label="alias">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
</application>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- $(TargetFrameworks) is used to allow the $(TargetFramework) check in Directory.Build.props to work.
If $(TargetFramework) is declared here instead, it will not be evaluated before Directory.Build.props
is loaded and the wrong $(TestOutputFullPath) will be used. -->
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
<IsPackable>false</IsPackable>
Expand Down