Skip to content
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

Jump to bottom

Sample for Intune with Android MAM Corrections #192

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Sample for Intune with Android MAM Corrections #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3158c66
Update active-directory-xamarin-intune.csproj
meghandaly May 16, 2022
8f88a53
Update active-directory-xamarin-intune.Android.csproj
meghandaly May 16, 2022
4418435
Update IntuneMAMConnector.cs
meghandaly May 16, 2022
946fbfa
Update MainActivity.cs
meghandaly May 16, 2022
28ab4b6
Update styles.xml
meghandaly May 16, 2022
53046c1
Update active-directory-xamarin-intune.iOS.csproj
meghandaly May 16, 2022
5e9d1bf
Delete Resource.designer.cs
meghandaly May 16, 2022
789e650
Update .gitignore
meghandaly May 16, 2022
dfcc8af
Merge branch 'main' into medaly/with-intune-android
meghandaly Jun 14, 2022
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
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ bld/
[Bb]in/
[Oo]bj/

# Resource.Designer.cs files
**/Resources/[Rr]esource.[Dd]esigner.cs
**/*.Droid/**/[Rr]esource.[Dd]esigner.cs
**/*.Android/**/[Rr]esource.[Dd]esigner.cs
**/Android/**/[Rr]esource.[Dd]esigner.cs
**/Droid/**/[Rr]esource.[Dd]esigner.cs

# Visual Studo 2015 cache/options directory
.vs/

Expand Down
1 change: 1 addition & 0 deletions 3-With-Intune MAM/IntuneClient/active-directory-xamarin-intune.Android/IntuneMAMConnector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.Intune.Mam.Client.App;
using Microsoft.Intune.Mam.Policy;

[assembly: Xamarin.Forms.Dependency(typeof(IIntuneMAMConnector))]
namespace active_directory_xamarin_intune.Droid
{
public class IntuneMAMConnector : IIntuneMAMConnector
Expand Down
22 changes: 6 additions & 16 deletions 3-With-Intune MAM/IntuneClient/active-directory-xamarin-intune.Android/MainActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;

using Android.App;
using Android.Content.PM;
using Android.Runtime;
Expand All @@ -17,28 +15,20 @@ public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompa
{
private const string AndroidRedirectURI = "msauth://com.yourcompany.xamarinintuneapp/JjmT52ASxa1Lz55s+qPPgxb5xeo="; // TODO - Replace with your redirectURI

IIntuneMAMConnector _connector = new IntuneMAMConnector();

protected override void OnCreate(Bundle savedInstanceState)
protected override void OnMAMCreate(Bundle savedInstanceState)
{
base.OnCreate(savedInstanceState);
base.OnMAMCreate(savedInstanceState);

Xamarin.Essentials.Platform.Init(this, savedInstanceState);
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);

// configure platform specific params
PlatformConfigImpl.Instance.RedirectUri = AndroidRedirectURI;
PlatformConfigImpl.Instance.ParentWindow = this;

// register IntuneMAMConnector
Xamarin.Forms.DependencyService.RegisterSingleton<IIntuneMAMConnector>(_connector);

LoadApplication(new App());
}
public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method does not seem to do anything but to call the base class. Is it worth overriding it?

{
Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);

base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
}

Expand All @@ -49,9 +39,9 @@ public override void OnRequestPermissionsResult(int requestCode, string[] permis
/// <param name="requestCode">request code </param>
/// <param name="resultCode">result code</param>
/// <param name="data">intent of the actvity</param>
protected override void OnActivityResult(int requestCode, [GeneratedEnum] Result resultCode, Intent data)
protected override void OnMAMActivityResult(int requestCode, [GeneratedEnum] Result resultCode, Intent data)
{
base.OnActivityResult(requestCode, resultCode, data);
base.OnMAMActivityResult(requestCode, resultCode, data);
AuthenticationContinuationHelper.SetAuthenticationContinuationEventArgs(requestCode, resultCode, data);
}
}
Expand Down
23,493 changes: 0 additions & 23,493 deletions ...e MAM/IntuneClient/active-directory-xamarin-intune.Android/Resources/Resource.designer.cs
View file
Open in desktop

This file was deleted.

42 changes: 28 additions & 14 deletions ...tune MAM/IntuneClient/active-directory-xamarin-intune.Android/Resources/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,32 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License. -->
<resources>

<style name="MainTheme" parent="MainTheme.Base">
<!-- As of Xamarin.Forms 4.6 the theme has moved into the Forms binary -->
<!-- If you want to override anything you can do that here. -->
<!-- Underneath are a couple of entries to get you started. -->

<!-- Set theme colors from https://aka.ms/material-colors -->
<!-- colorPrimary is used for the default action bar background -->
<!--<item name="colorPrimary">#2196F3</item>-->
<!-- colorPrimaryDark is used for the status bar -->
<!--<item name="colorPrimaryDark">#1976D2</item>-->
<!-- colorAccent is used as the default value for colorControlActivated
<style name="MainTheme" parent="MainTheme.Base">
</style>
<!-- Base theme applied no matter what API -->
<style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
<!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
<item name="windowNoTitle">true</item>
<!--We will be using the toolbar so no need to show ActionBar-->
<item name="windowActionBar">false</item>
<!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette -->
<!-- colorPrimary is used for the default action bar background -->
<item name="colorPrimary">@color/colorPrimary</item>
<!-- colorPrimaryDark is used for the status bar -->
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<!-- colorAccent is used as the default value for colorControlActivated
which is used to tint widgets -->
<!--<item name="colorAccent">#FF4081</item>-->
</style>
<item name="colorAccent">@color/colorAccent</item>
<!-- You can also set colorControlNormal, colorControlActivated
colorControlHighlight and colorSwitchThumbNormal. -->
<item name="windowActionModeOverlay">true</item>

<item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
</style>

<style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">#FF4081</item>
</style>
</resources>
45 changes: 36 additions & 9 deletions ...nt/active-directory-xamarin-intune.Android/active-directory-xamarin-intune.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -16,7 +16,7 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
Expand All @@ -31,9 +31,12 @@
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidUseAapt2>false</AndroidUseAapt2>
<AndroidLinkTool>r8</AndroidLinkTool>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -44,6 +47,10 @@
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidEnableMultiDex>true</AndroidEnableMultiDex>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
Expand All @@ -58,16 +65,36 @@
<PackageReference Include="Microsoft.Identity.Client">
<Version>4.44.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Microsoft.Intune.MAM.Xamarin.Android">
<Version>3.0.4635.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Emoji.AppCompat">
<Version>1.1.0</Version>
<PackageReference Include="Microsoft.Intune.MAM.Remapper.Tasks">
<Version>0.1.4635.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Compat">
<Version>28.0.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Constraint.Layout">
<Version>1.1.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Design">
<Version>28.0.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Emoji.AppCompat">
<Version>28.0.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v17.Leanback">
<Version>28.0.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
<Version>28.0.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Leanback">
<Version>1.0.0.5</Version>
<PackageReference Include="Xamarin.Forms">
<Version>4.4.0.991864</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -110,4 +137,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions ...tuneClient/active-directory-xamarin-intune.iOS/active-directory-xamarin-intune.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<PackageReference Include="Microsoft.Identity.Client">
<Version>4.44.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991864" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Microsoft.Intune.MAM.Xamarin.iOS">
<Version>15.3.0.1</Version>
Expand All @@ -143,4 +143,4 @@
<Name>active-directory-xamarin-intune</Name>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions ...e MAM/IntuneClient/active-directory-xamarin-intune/active-directory-xamarin-intune.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client" Version="4.44.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991864" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
</ItemGroup>
</Project>
</Project>