read yubikey and log in

src/Android/Android.csproj

@@ -860,6 +860,18 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxxhdpi\share_tools.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\yubikey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\yubikey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\yubikey.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\yubikey.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

src/Android/MainActivity.cs

@@ -51,7 +51,7 @@ namespace Bit.Android
 
             Console.WriteLine("A OnCreate");
             Window.SetSoftInputMode(SoftInput.StateHidden);
-            Window.AddFlags(WindowManagerFlags.Secure);
+            //Window.AddFlags(WindowManagerFlags.Secure);
 
             var appIdService = Resolver.Resolve<IAppIdService>();
             var authService = Resolver.Resolve<IAuthService>();
@@ -105,10 +105,10 @@ namespace Bit.Android
                 LaunchApp(args);
             });
 
-            MessagingCenter.Subscribe<Xamarin.Forms.Application>(
-                Xamarin.Forms.Application.Current, "ListenYubiKeyOTP", (sender) =>
+            MessagingCenter.Subscribe<Xamarin.Forms.Application, bool>(
+                Xamarin.Forms.Application.Current, "ListenYubiKeyOTP", (sender, listen) =>
             {
-                ListenYubiKey();
+                ListenYubiKey(listen);
             });
         }
 
@@ -142,6 +142,7 @@ namespace Bit.Android
         {
             Console.WriteLine("A OnPause");
             base.OnPause();
+            ListenYubiKey(false);
         }
 
         protected override void OnDestroy()
@@ -176,6 +177,18 @@ namespace Bit.Android
             // workaround for app compat bug
             // ref https://bugzilla.xamarin.com/show_bug.cgi?id=36907
             Task.Delay(10).Wait();
+
+            if(Utilities.NfcEnabled())
+            {
+                MessagingCenter.Send(Xamarin.Forms.Application.Current, "ResumeYubiKey");
+            }
+        }
+
+        protected override void OnNewIntent(Intent intent)
+        {
+            base.OnNewIntent(intent);
+            Console.WriteLine("A OnNewIntent");
+            ParseYubiKey(intent.DataString);
         }
 
         public void RateApp()
@@ -237,35 +250,47 @@ namespace Bit.Android
             }
         }
 
-        private void ListenYubiKey()
+        private void ListenYubiKey(bool listen)
         {
-            var intent = new Intent(this, Class);
-            intent.AddFlags(ActivityFlags.SingleTop);
-            var pendingIntent = PendingIntent.GetActivity(this, 0, intent, 0);
-
-            // register for all NDEF tags starting with http och https
-            var ndef = new IntentFilter(NfcAdapter.ActionNdefDiscovered);
-            ndef.AddDataScheme("http");
-            ndef.AddDataScheme("https");
-
-            // register for foreground dispatch so we'll receive tags according to our intent filters
-            var adapter = NfcAdapter.GetDefaultAdapter(this);
-            adapter.EnableForegroundDispatch(this, pendingIntent, new IntentFilter[] { ndef }, null);
-
-            var data = Intent.DataString;
-            if(data != null)
+            if(!Utilities.NfcEnabled())
             {
-                var otpMatch = _otpPattern.Matcher(data);
-                if(otpMatch.Matches())
-                {
-                    var otp = otpMatch.Group(1);
-                    Console.WriteLine("Got OTP: " + otp);
-                    MessagingCenter.Send(Xamarin.Forms.Application.Current, "GotYubiKeyOTP", otp);
-                }
-                else
-                {
-                    Console.WriteLine("Data from ndef didn't match, it was: " + data);
-                }
+                return;
+            }
+
+            var adapter = NfcAdapter.GetDefaultAdapter(this);
+            if(listen)
+            {
+                var intent = new Intent(this, Class);
+                intent.AddFlags(ActivityFlags.SingleTop);
+                var pendingIntent = PendingIntent.GetActivity(this, 0, intent, 0);
+
+                // register for all NDEF tags starting with http och https
+                var ndef = new IntentFilter(NfcAdapter.ActionNdefDiscovered);
+                ndef.AddDataScheme("http");
+                ndef.AddDataScheme("https");
+                var filters = new IntentFilter[] { ndef };
+
+                // register for foreground dispatch so we'll receive tags according to our intent filters
+                adapter.EnableForegroundDispatch(this, pendingIntent, filters, null);
+            }
+            else
+            {
+                adapter.DisableForegroundDispatch(this);
+            }
+        }
+
+        private void ParseYubiKey(string data)
+        {
+            if(data == null)
+            {
+                return;
+            }
+
+            var otpMatch = _otpPattern.Matcher(data);
+            if(otpMatch.Matches())
+            {
+                var otp = otpMatch.Group(1);
+                MessagingCenter.Send(Xamarin.Forms.Application.Current, "GotYubiKeyOTP", otp);
             }
         }
     }

src/Android/Resources/Resource.Designer.cs

@@ -2744,8 +2744,8 @@ namespace Bit.Android
 			// aapt resource value: 0x7f0200e4
 			public const int notification_sm = 2130837732;
 			
-			// aapt resource value: 0x7f0200f3
-			public const int notification_template_icon_bg = 2130837747;
+			// aapt resource value: 0x7f0200f4
+			public const int notification_template_icon_bg = 2130837748;
 			
 			// aapt resource value: 0x7f0200e5
 			public const int plus = 2130837733;
@@ -2789,6 +2789,9 @@ namespace Bit.Android
 			// aapt resource value: 0x7f0200f2
 			public const int user = 2130837746;
 			
+			// aapt resource value: 0x7f0200f3
+			public const int yubikey = 2130837747;
+			
 			static Drawable()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();

src/Android/Services/DeviceInfoService.cs

@@ -1,5 +1,4 @@
 using Android.App;
-using Android.Nfc;
 using Android.OS;
 using Bit.App.Abstractions;
 
@@ -42,14 +41,6 @@ namespace Bit.Android.Services
                 return 1f;
             }
         }
-        public bool NfcEnabled
-        {
-            get
-            {
-                var manager = (NfcManager)Application.Context.GetSystemService("nfc");
-                var adapter = manager.DefaultAdapter;
-                return adapter != null && adapter.IsEnabled;
-            }
-        }
+        public bool NfcEnabled => Utilities.NfcEnabled();
     }
 }

src/Android/Utilities.cs

@@ -3,11 +3,19 @@ using Android.App;
 using Android.Content;
 using Java.Security;
 using System.IO;
+using Android.Nfc;
 
 namespace Bit.Android
 {
     public static class Utilities
     {
+        public static bool NfcEnabled()
+        {
+            var manager = (NfcManager)Application.Context.GetSystemService("nfc");
+            var adapter = manager.DefaultAdapter;
+            return adapter != null && adapter.IsEnabled;
+        }
+
         public static void SendCrashEmail(Exception e, bool includeSecurityProviders = true)
         {
             SendCrashEmail(e.Message + "\n\n" + e.StackTrace, includeSecurityProviders);