From 366b9ddc4a65a51f9630f5f823b2e36e468c9f6d Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 16 Jul 2018 08:55:37 -0400 Subject: [PATCH] update libs. update android security provider --- src/Android/Android.csproj | 3 ++ src/Android/MainApplication.cs | 16 ++++++++++- src/Android/Resources/Resource.Designer.cs | 33 ++++------------------ src/App/App.csproj | 4 +-- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 8d965e627..8d5332e72 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -869,6 +869,9 @@ 25.4.0.2 + + 42.1021.1 + diff --git a/src/Android/MainApplication.cs b/src/Android/MainApplication.cs index 63b3a0d0e..246dc8305 100644 --- a/src/Android/MainApplication.cs +++ b/src/Android/MainApplication.cs @@ -15,6 +15,7 @@ using XLabs.Ioc; using System.Threading.Tasks; using XLabs.Ioc.SimpleInjectorContainer; using SimpleInjector; +using Android.Gms.Security; namespace Bit.Android { @@ -23,7 +24,7 @@ namespace Bit.Android #else [Application(Debuggable = false)] #endif - public class MainApplication : Application + public class MainApplication : Application, ProviderInstaller.IProviderInstallListener { private const string FirstLaunchKey = "firstLaunch"; private const string LastVersionCodeKey = "lastVersionCode"; @@ -37,6 +38,11 @@ namespace Bit.Android { SetIoc(this); } + + if(Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat) + { + ProviderInstaller.InstallIfNeededAsync(ApplicationContext, this); + } } private void AndroidEnvironment_UnhandledExceptionRaiser(object sender, RaiseThrowableEventArgs e) @@ -132,5 +138,13 @@ namespace Bit.Android container.Verify(); Resolver.SetResolver(new SimpleInjectorResolver(container)); } + + public void OnProviderInstallFailed(int errorCode, Intent recoveryIntent) + { + } + + public void OnProviderInstalled() + { + } } } \ No newline at end of file diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index f6e27034f..6afae81d4 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -6507,17 +6507,17 @@ namespace Bit.Android // aapt resource value: 0x7f0a0051 public const int ApplicationName = 2131361873; - // aapt resource value: 0x7f0a00b0 - public const int AutoFillServiceDescription = 2131361968; + // aapt resource value: 0x7f0a00a9 + public const int AutoFillServiceDescription = 2131361961; - // aapt resource value: 0x7f0a00af - public const int AutoFillServiceSummary = 2131361967; + // aapt resource value: 0x7f0a00a8 + public const int AutoFillServiceSummary = 2131361960; // aapt resource value: 0x7f0a0050 public const int Hello = 2131361872; - // aapt resource value: 0x7f0a00b1 - public const int MyVault = 2131361969; + // aapt resource value: 0x7f0a00aa + public const int MyVault = 2131361962; // aapt resource value: 0x7f0a0027 public const int abc_action_bar_home_description = 2131361831; @@ -6672,27 +6672,6 @@ namespace Bit.Android // aapt resource value: 0x7f0a000f public const int common_signin_button_text_long = 2131361807; - // aapt resource value: 0x7f0a00aa - public const int default_web_client_id = 2131361962; - - // aapt resource value: 0x7f0a00ab - public const int firebase_database_url = 2131361963; - - // aapt resource value: 0x7f0a00a8 - public const int gcm_defaultSenderId = 2131361960; - - // aapt resource value: 0x7f0a00ac - public const int google_api_key = 2131361964; - - // aapt resource value: 0x7f0a00a9 - public const int google_app_id = 2131361961; - - // aapt resource value: 0x7f0a00ad - public const int google_crash_reporting_api_key = 2131361965; - - // aapt resource value: 0x7f0a00ae - public const int google_storage_bucket = 2131361966; - // aapt resource value: 0x7f0a0052 public const int hockeyapp_crash_dialog_app_name_fallback = 2131361874; diff --git a/src/App/App.csproj b/src/App/App.csproj index 31f5db1a6..b342f2f51 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -32,10 +32,10 @@ - + - +