update and refactor for settings changes

src/Android/Android.csproj

@@ -106,10 +106,10 @@
       <HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
     </Reference>
     <Reference Include="HockeySDK, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\MonoAndroid403\HockeySDK.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\MonoAndroid403\HockeySDK.dll</HintPath>
     </Reference>
     <Reference Include="HockeySDK.AndroidBindings, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\MonoAndroid403\HockeySDK.AndroidBindings.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\MonoAndroid403\HockeySDK.AndroidBindings.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
@@ -161,11 +161,11 @@
     <Reference Include="Plugin.Fingerprint.Android.Samsung, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Plugin.Fingerprint.1.4.4\lib\MonoAndroid\Plugin.Fingerprint.Android.Samsung.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="PushNotification.Plugin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xam.Plugin.PushNotification.1.2.4\lib\MonoAndroid10\PushNotification.Plugin.dll</HintPath>

src/Android/Resources/Resource.Designer.cs

@@ -127,10 +127,14 @@ namespace Bit.Android
 			global::HockeyApp.Resource.String.hockeyapp_expiry_info_title = global::Bit.Android.Resource.String.hockeyapp_expiry_info_title;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_attach_file = global::Bit.Android.Resource.String.hockeyapp_feedback_attach_file;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_attach_picture = global::Bit.Android.Resource.String.hockeyapp_feedback_attach_picture;
+			global::HockeyApp.Resource.String.hockeyapp_feedback_attachment_added = global::Bit.Android.Resource.String.hockeyapp_feedback_attachment_added;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_attachment_button_text = global::Bit.Android.Resource.String.hockeyapp_feedback_attachment_button_text;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_attachment_error = global::Bit.Android.Resource.String.hockeyapp_feedback_attachment_error;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_attachment_loading = global::Bit.Android.Resource.String.hockeyapp_feedback_attachment_loading;
+			global::HockeyApp.Resource.String.hockeyapp_feedback_attachment_remove_description = global::Bit.Android.Resource.String.hockeyapp_feedback_attachment_remove_description;
+			global::HockeyApp.Resource.String.hockeyapp_feedback_attachment_removed = global::Bit.Android.Resource.String.hockeyapp_feedback_attachment_removed;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_email_hint = global::Bit.Android.Resource.String.hockeyapp_feedback_email_hint;
+			global::HockeyApp.Resource.String.hockeyapp_feedback_email_hint_required = global::Bit.Android.Resource.String.hockeyapp_feedback_email_hint_required;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_failed_text = global::Bit.Android.Resource.String.hockeyapp_feedback_failed_text;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_failed_title = global::Bit.Android.Resource.String.hockeyapp_feedback_failed_title;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_fetching_feedback_text = global::Bit.Android.Resource.String.hockeyapp_feedback_fetching_feedback_text;
@@ -138,7 +142,9 @@ namespace Bit.Android
 			global::HockeyApp.Resource.String.hockeyapp_feedback_last_updated_text = global::Bit.Android.Resource.String.hockeyapp_feedback_last_updated_text;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_max_attachments_allowed = global::Bit.Android.Resource.String.hockeyapp_feedback_max_attachments_allowed;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_message_hint = global::Bit.Android.Resource.String.hockeyapp_feedback_message_hint;
+			global::HockeyApp.Resource.String.hockeyapp_feedback_message_hint_required = global::Bit.Android.Resource.String.hockeyapp_feedback_message_hint_required;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_name_hint = global::Bit.Android.Resource.String.hockeyapp_feedback_name_hint;
+			global::HockeyApp.Resource.String.hockeyapp_feedback_name_hint_required = global::Bit.Android.Resource.String.hockeyapp_feedback_name_hint_required;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_refresh_button_text = global::Bit.Android.Resource.String.hockeyapp_feedback_refresh_button_text;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_response_button_text = global::Bit.Android.Resource.String.hockeyapp_feedback_response_button_text;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_select_file = global::Bit.Android.Resource.String.hockeyapp_feedback_select_file;
@@ -147,7 +153,9 @@ namespace Bit.Android
 			global::HockeyApp.Resource.String.hockeyapp_feedback_send_generic_error = global::Bit.Android.Resource.String.hockeyapp_feedback_send_generic_error;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_send_network_error = global::Bit.Android.Resource.String.hockeyapp_feedback_send_network_error;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_sending_feedback_text = global::Bit.Android.Resource.String.hockeyapp_feedback_sending_feedback_text;
+			global::HockeyApp.Resource.String.hockeyapp_feedback_sent_toast = global::Bit.Android.Resource.String.hockeyapp_feedback_sent_toast;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_subject_hint = global::Bit.Android.Resource.String.hockeyapp_feedback_subject_hint;
+			global::HockeyApp.Resource.String.hockeyapp_feedback_subject_hint_required = global::Bit.Android.Resource.String.hockeyapp_feedback_subject_hint_required;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_title = global::Bit.Android.Resource.String.hockeyapp_feedback_title;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_validate_email_empty = global::Bit.Android.Resource.String.hockeyapp_feedback_validate_email_empty;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_validate_email_error = global::Bit.Android.Resource.String.hockeyapp_feedback_validate_email_error;
@@ -155,11 +163,13 @@ namespace Bit.Android
 			global::HockeyApp.Resource.String.hockeyapp_feedback_validate_subject_error = global::Bit.Android.Resource.String.hockeyapp_feedback_validate_subject_error;
 			global::HockeyApp.Resource.String.hockeyapp_feedback_validate_text_error = global::Bit.Android.Resource.String.hockeyapp_feedback_validate_text_error;
 			global::HockeyApp.Resource.String.hockeyapp_login_email_hint = global::Bit.Android.Resource.String.hockeyapp_login_email_hint;
+			global::HockeyApp.Resource.String.hockeyapp_login_email_hint_required = global::Bit.Android.Resource.String.hockeyapp_login_email_hint_required;
 			global::HockeyApp.Resource.String.hockeyapp_login_headline_text = global::Bit.Android.Resource.String.hockeyapp_login_headline_text;
 			global::HockeyApp.Resource.String.hockeyapp_login_headline_text_email_only = global::Bit.Android.Resource.String.hockeyapp_login_headline_text_email_only;
 			global::HockeyApp.Resource.String.hockeyapp_login_login_button_text = global::Bit.Android.Resource.String.hockeyapp_login_login_button_text;
 			global::HockeyApp.Resource.String.hockeyapp_login_missing_credentials_toast = global::Bit.Android.Resource.String.hockeyapp_login_missing_credentials_toast;
 			global::HockeyApp.Resource.String.hockeyapp_login_password_hint = global::Bit.Android.Resource.String.hockeyapp_login_password_hint;
+			global::HockeyApp.Resource.String.hockeyapp_login_password_hint_required = global::Bit.Android.Resource.String.hockeyapp_login_password_hint_required;
 			global::HockeyApp.Resource.String.hockeyapp_paint_dialog_message = global::Bit.Android.Resource.String.hockeyapp_paint_dialog_message;
 			global::HockeyApp.Resource.String.hockeyapp_paint_dialog_negative_button = global::Bit.Android.Resource.String.hockeyapp_paint_dialog_negative_button;
 			global::HockeyApp.Resource.String.hockeyapp_paint_dialog_neutral_button = global::Bit.Android.Resource.String.hockeyapp_paint_dialog_neutral_button;
@@ -3740,8 +3750,8 @@ namespace Bit.Android
 			// aapt resource value: 0x7f080047
 			public const int ApplicationName = 2131230791;
 			
-			// aapt resource value: 0x7f08008f
+			// aapt resource value: 0x7f080099
-			public const int AutoFillServiceDescription = 2131230863;
+			public const int AutoFillServiceDescription = 2131230873;
 			
 			// aapt resource value: 0x7f080046
 			public const int Hello = 2131230790;
@@ -3963,160 +3973,190 @@ namespace Bit.Android
 			public const int hockeyapp_feedback_attach_picture = 2131230810;
 			
 			// aapt resource value: 0x7f08005b
-			public const int hockeyapp_feedback_attachment_button_text = 2131230811;
+			public const int hockeyapp_feedback_attachment_added = 2131230811;
 			
 			// aapt resource value: 0x7f08005c
-			public const int hockeyapp_feedback_attachment_error = 2131230812;
+			public const int hockeyapp_feedback_attachment_button_text = 2131230812;
 			
 			// aapt resource value: 0x7f08005d
-			public const int hockeyapp_feedback_attachment_loading = 2131230813;
+			public const int hockeyapp_feedback_attachment_error = 2131230813;
 			
 			// aapt resource value: 0x7f08005e
-			public const int hockeyapp_feedback_email_hint = 2131230814;
+			public const int hockeyapp_feedback_attachment_loading = 2131230814;
 			
 			// aapt resource value: 0x7f08005f
-			public const int hockeyapp_feedback_failed_text = 2131230815;
+			public const int hockeyapp_feedback_attachment_remove_description = 2131230815;
 			
 			// aapt resource value: 0x7f080060
-			public const int hockeyapp_feedback_failed_title = 2131230816;
+			public const int hockeyapp_feedback_attachment_removed = 2131230816;
 			
 			// aapt resource value: 0x7f080061
-			public const int hockeyapp_feedback_fetching_feedback_text = 2131230817;
+			public const int hockeyapp_feedback_email_hint = 2131230817;
 			
 			// aapt resource value: 0x7f080062
-			public const int hockeyapp_feedback_generic_error = 2131230818;
+			public const int hockeyapp_feedback_email_hint_required = 2131230818;
 			
 			// aapt resource value: 0x7f080063
-			public const int hockeyapp_feedback_last_updated_text = 2131230819;
+			public const int hockeyapp_feedback_failed_text = 2131230819;
 			
 			// aapt resource value: 0x7f080064
-			public const int hockeyapp_feedback_max_attachments_allowed = 2131230820;
+			public const int hockeyapp_feedback_failed_title = 2131230820;
 			
 			// aapt resource value: 0x7f080065
-			public const int hockeyapp_feedback_message_hint = 2131230821;
+			public const int hockeyapp_feedback_fetching_feedback_text = 2131230821;
 			
 			// aapt resource value: 0x7f080066
-			public const int hockeyapp_feedback_name_hint = 2131230822;
+			public const int hockeyapp_feedback_generic_error = 2131230822;
 			
 			// aapt resource value: 0x7f080067
-			public const int hockeyapp_feedback_refresh_button_text = 2131230823;
+			public const int hockeyapp_feedback_last_updated_text = 2131230823;
 			
 			// aapt resource value: 0x7f080068
-			public const int hockeyapp_feedback_response_button_text = 2131230824;
+			public const int hockeyapp_feedback_max_attachments_allowed = 2131230824;
 			
 			// aapt resource value: 0x7f080069
-			public const int hockeyapp_feedback_select_file = 2131230825;
+			public const int hockeyapp_feedback_message_hint = 2131230825;
 			
 			// aapt resource value: 0x7f08006a
-			public const int hockeyapp_feedback_select_picture = 2131230826;
+			public const int hockeyapp_feedback_message_hint_required = 2131230826;
 			
 			// aapt resource value: 0x7f08006b
-			public const int hockeyapp_feedback_send_button_text = 2131230827;
+			public const int hockeyapp_feedback_name_hint = 2131230827;
 			
 			// aapt resource value: 0x7f08006c
-			public const int hockeyapp_feedback_send_generic_error = 2131230828;
+			public const int hockeyapp_feedback_name_hint_required = 2131230828;
 			
 			// aapt resource value: 0x7f08006d
-			public const int hockeyapp_feedback_send_network_error = 2131230829;
+			public const int hockeyapp_feedback_refresh_button_text = 2131230829;
 			
 			// aapt resource value: 0x7f08006e
-			public const int hockeyapp_feedback_sending_feedback_text = 2131230830;
+			public const int hockeyapp_feedback_response_button_text = 2131230830;
 			
 			// aapt resource value: 0x7f08006f
-			public const int hockeyapp_feedback_subject_hint = 2131230831;
+			public const int hockeyapp_feedback_select_file = 2131230831;
 			
 			// aapt resource value: 0x7f080070
-			public const int hockeyapp_feedback_title = 2131230832;
+			public const int hockeyapp_feedback_select_picture = 2131230832;
 			
 			// aapt resource value: 0x7f080071
-			public const int hockeyapp_feedback_validate_email_empty = 2131230833;
+			public const int hockeyapp_feedback_send_button_text = 2131230833;
 			
 			// aapt resource value: 0x7f080072
-			public const int hockeyapp_feedback_validate_email_error = 2131230834;
+			public const int hockeyapp_feedback_send_generic_error = 2131230834;
 			
 			// aapt resource value: 0x7f080073
-			public const int hockeyapp_feedback_validate_name_error = 2131230835;
+			public const int hockeyapp_feedback_send_network_error = 2131230835;
 			
 			// aapt resource value: 0x7f080074
-			public const int hockeyapp_feedback_validate_subject_error = 2131230836;
+			public const int hockeyapp_feedback_sending_feedback_text = 2131230836;
 			
 			// aapt resource value: 0x7f080075
-			public const int hockeyapp_feedback_validate_text_error = 2131230837;
+			public const int hockeyapp_feedback_sent_toast = 2131230837;
 			
 			// aapt resource value: 0x7f080076
-			public const int hockeyapp_login_email_hint = 2131230838;
+			public const int hockeyapp_feedback_subject_hint = 2131230838;
 			
 			// aapt resource value: 0x7f080077
-			public const int hockeyapp_login_headline_text = 2131230839;
+			public const int hockeyapp_feedback_subject_hint_required = 2131230839;
 			
 			// aapt resource value: 0x7f080078
-			public const int hockeyapp_login_headline_text_email_only = 2131230840;
+			public const int hockeyapp_feedback_title = 2131230840;
 			
 			// aapt resource value: 0x7f080079
-			public const int hockeyapp_login_login_button_text = 2131230841;
+			public const int hockeyapp_feedback_validate_email_empty = 2131230841;
 			
 			// aapt resource value: 0x7f08007a
-			public const int hockeyapp_login_missing_credentials_toast = 2131230842;
+			public const int hockeyapp_feedback_validate_email_error = 2131230842;
 			
 			// aapt resource value: 0x7f08007b
-			public const int hockeyapp_login_password_hint = 2131230843;
+			public const int hockeyapp_feedback_validate_name_error = 2131230843;
 			
 			// aapt resource value: 0x7f08007c
-			public const int hockeyapp_paint_dialog_message = 2131230844;
+			public const int hockeyapp_feedback_validate_subject_error = 2131230844;
 			
 			// aapt resource value: 0x7f08007d
-			public const int hockeyapp_paint_dialog_negative_button = 2131230845;
+			public const int hockeyapp_feedback_validate_text_error = 2131230845;
 			
 			// aapt resource value: 0x7f08007e
-			public const int hockeyapp_paint_dialog_neutral_button = 2131230846;
+			public const int hockeyapp_login_email_hint = 2131230846;
 			
 			// aapt resource value: 0x7f08007f
-			public const int hockeyapp_paint_dialog_positive_button = 2131230847;
+			public const int hockeyapp_login_email_hint_required = 2131230847;
 			
 			// aapt resource value: 0x7f080080
-			public const int hockeyapp_paint_indicator_toast = 2131230848;
+			public const int hockeyapp_login_headline_text = 2131230848;
 			
 			// aapt resource value: 0x7f080081
-			public const int hockeyapp_paint_menu_clear = 2131230849;
+			public const int hockeyapp_login_headline_text_email_only = 2131230849;
 			
 			// aapt resource value: 0x7f080082
-			public const int hockeyapp_paint_menu_save = 2131230850;
+			public const int hockeyapp_login_login_button_text = 2131230850;
 			
 			// aapt resource value: 0x7f080083
-			public const int hockeyapp_paint_menu_undo = 2131230851;
+			public const int hockeyapp_login_missing_credentials_toast = 2131230851;
 			
 			// aapt resource value: 0x7f080084
-			public const int hockeyapp_permission_dialog_negative_button = 2131230852;
+			public const int hockeyapp_login_password_hint = 2131230852;
 			
 			// aapt resource value: 0x7f080085
-			public const int hockeyapp_permission_dialog_positive_button = 2131230853;
+			public const int hockeyapp_login_password_hint_required = 2131230853;
 			
 			// aapt resource value: 0x7f080086
-			public const int hockeyapp_permission_update_message = 2131230854;
+			public const int hockeyapp_paint_dialog_message = 2131230854;
 			
 			// aapt resource value: 0x7f080087
-			public const int hockeyapp_permission_update_title = 2131230855;
+			public const int hockeyapp_paint_dialog_negative_button = 2131230855;
 			
 			// aapt resource value: 0x7f080088
-			public const int hockeyapp_update_button = 2131230856;
+			public const int hockeyapp_paint_dialog_neutral_button = 2131230856;
 			
 			// aapt resource value: 0x7f080089
-			public const int hockeyapp_update_dialog_message = 2131230857;
+			public const int hockeyapp_paint_dialog_positive_button = 2131230857;
 			
 			// aapt resource value: 0x7f08008a
-			public const int hockeyapp_update_dialog_negative_button = 2131230858;
+			public const int hockeyapp_paint_indicator_toast = 2131230858;
 			
 			// aapt resource value: 0x7f08008b
-			public const int hockeyapp_update_dialog_positive_button = 2131230859;
+			public const int hockeyapp_paint_menu_clear = 2131230859;
 			
 			// aapt resource value: 0x7f08008c
-			public const int hockeyapp_update_dialog_title = 2131230860;
+			public const int hockeyapp_paint_menu_save = 2131230860;
 			
 			// aapt resource value: 0x7f08008d
-			public const int hockeyapp_update_mandatory_toast = 2131230861;
+			public const int hockeyapp_paint_menu_undo = 2131230861;
 			
 			// aapt resource value: 0x7f08008e
-			public const int hockeyapp_update_version_details_label = 2131230862;
+			public const int hockeyapp_permission_dialog_negative_button = 2131230862;
+			
+			// aapt resource value: 0x7f08008f
+			public const int hockeyapp_permission_dialog_positive_button = 2131230863;
+			
+			// aapt resource value: 0x7f080090
+			public const int hockeyapp_permission_update_message = 2131230864;
+			
+			// aapt resource value: 0x7f080091
+			public const int hockeyapp_permission_update_title = 2131230865;
+			
+			// aapt resource value: 0x7f080092
+			public const int hockeyapp_update_button = 2131230866;
+			
+			// aapt resource value: 0x7f080093
+			public const int hockeyapp_update_dialog_message = 2131230867;
+			
+			// aapt resource value: 0x7f080094
+			public const int hockeyapp_update_dialog_negative_button = 2131230868;
+			
+			// aapt resource value: 0x7f080095
+			public const int hockeyapp_update_dialog_positive_button = 2131230869;
+			
+			// aapt resource value: 0x7f080096
+			public const int hockeyapp_update_dialog_title = 2131230870;
+			
+			// aapt resource value: 0x7f080097
+			public const int hockeyapp_update_mandatory_toast = 2131230871;
+			
+			// aapt resource value: 0x7f080098
+			public const int hockeyapp_update_version_details_label = 2131230872;
 			
 			// aapt resource value: 0x7f080045
 			public const int library_name = 2131230789;

src/Android/Services/AndroidKeyStoreStorageService.cs

@@ -76,7 +76,7 @@ namespace Bit.Android.Services
                 return TryGetAndMigrate(key);
             }
 
-            var cs = _settings.GetValueOrDefault<string>(formattedKey);
+            var cs = _settings.GetValueOrDefault(formattedKey, null);
             if(string.IsNullOrWhiteSpace(cs))
             {
                 return null;
@@ -201,7 +201,7 @@ namespace Bit.Android.Services
                     return null;
                 }
 
-                var encKey = _settings.GetValueOrDefault<string>(aesKey);
+                var encKey = _settings.GetValueOrDefault(aesKey, null);
                 if(string.IsNullOrWhiteSpace(encKey))
                 {
                     return null;
@@ -312,7 +312,7 @@ namespace Bit.Android.Services
                 {
                     try
                     {
-                        var cs = _settings.GetValueOrDefault<string>(formattedKeyV1);
+                        var cs = _settings.GetValueOrDefault(formattedKeyV1, null);
                         var value = App.Utilities.Crypto.AesCbcDecrypt(new App.Models.CipherString(cs), aesKeyV1);
                         Store(key, value);
                         return value;

src/Android/packages.config

@@ -5,7 +5,7 @@
   <package id="AndHUD" version="1.2.0" targetFramework="monoandroid60" />
   <package id="BouncyCastle" version="1.8.1" targetFramework="monoandroid60" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid60" />
-  <package id="HockeySDK.Xamarin" version="4.1.2" targetFramework="monoandroid71" />
+  <package id="HockeySDK.Xamarin" version="4.1.5" targetFramework="monoandroid71" />
   <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="monoandroid71" />
   <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="monoandroid71" />
   <package id="NETStandard.Library" version="1.6.0" targetFramework="monoandroid71" />
@@ -70,7 +70,7 @@
   <package id="Validation" version="2.3.7" targetFramework="monoandroid60" />
   <package id="Xam.Plugin.Connectivity" version="2.3.0" targetFramework="monoandroid71" />
   <package id="Xam.Plugin.PushNotification" version="1.2.4" targetFramework="monoandroid60" developmentDependency="true" />
-  <package id="Xam.Plugins.Settings" version="2.5.4" targetFramework="monoandroid71" />
+  <package id="Xam.Plugins.Settings" version="3.0.1" targetFramework="monoandroid71" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" />

src/App/App.csproj

@@ -413,8 +413,8 @@
     <Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="HockeySDK, Version=1.0.6288.33979, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="HockeySDK, Version=1.0.6387.33440, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\HockeySDK.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\HockeySDK.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
@@ -459,11 +459,11 @@
     <Reference Include="Plugin.Fingerprint.Abstractions, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Plugin.Fingerprint.1.4.4\lib\portable-net45+win8+wpa81+wp8\Plugin.Fingerprint.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\netstandard1.0\Plugin.Settings.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\netstandard1.0\Plugin.Settings.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="PushNotification.Plugin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xam.Plugin.PushNotification.1.2.4\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\PushNotification.Plugin.dll</HintPath>

src/App/Pages/Settings/SettingsSyncPage.cs

@@ -77,7 +77,11 @@ namespace Bit.App.Pages
 
         private void SetLastSync()
         {
-            var lastSyncDate = _settings.GetValueOrDefault<DateTime?>(Constants.LastSync, null);
+            DateTime? lastSyncDate = null;
+            if(_settings.Contains(Constants.LastSync))
+            {
+                lastSyncDate = _settings.GetValueOrDefault(Constants.LastSync, DateTime.UtcNow);
+            }
             try
             {
                 LastSyncLabel.Text = AppResources.LastSync + " " + lastSyncDate?.ToLocalTime().ToString() ?? AppResources.Never;

src/App/Pages/Vault/VaultListLoginsPage.cs

@@ -239,9 +239,8 @@ namespace Bit.App.Pages
                 var pushPromptShow = _settings.GetValueOrDefault(Constants.PushInitialPromptShown, false);
                 Action registerAction = () =>
                 {
-                    var lastPushRegistration = _settings.GetValueOrDefault<DateTime?>(Constants.PushLastRegistrationDate, null);
+                    var lastPushRegistration = _settings.GetValueOrDefault(Constants.PushLastRegistrationDate, DateTime.MinValue);
-                    if(!pushPromptShow || !lastPushRegistration.HasValue
+                    if(!pushPromptShow || DateTime.UtcNow - lastPushRegistration > TimeSpan.FromDays(1))
-                        || (DateTime.UtcNow - lastPushRegistration) > TimeSpan.FromDays(1))
                     {
                         _pushNotification.Register();
                     }

src/App/Services/AppSettingsService.cs

@@ -78,7 +78,7 @@ namespace Bit.App.Services
         {
             get
             {
-                return _settings.GetValueOrDefault<string>(Constants.SecurityStamp);
+                return _settings.GetValueOrDefault(Constants.SecurityStamp, null);
             }
             set
             {
@@ -90,7 +90,7 @@ namespace Bit.App.Services
         {
             get
             {
-                return _settings.GetValueOrDefault<string>(Constants.BaseUrl);
+                return _settings.GetValueOrDefault(Constants.BaseUrl, null);
             }
             set
             {
@@ -108,7 +108,7 @@ namespace Bit.App.Services
         {
             get
             {
-                return _settings.GetValueOrDefault<string>(Constants.WebVaultUrl);
+                return _settings.GetValueOrDefault(Constants.WebVaultUrl, null);
             }
             set
             {
@@ -126,7 +126,7 @@ namespace Bit.App.Services
         {
             get
             {
-                return _settings.GetValueOrDefault<string>(Constants.ApiUrl);
+                return _settings.GetValueOrDefault(Constants.ApiUrl, null);
             }
             set
             {
@@ -144,7 +144,7 @@ namespace Bit.App.Services
         {
             get
             {
-                return _settings.GetValueOrDefault<string>(Constants.IdentityUrl);
+                return _settings.GetValueOrDefault(Constants.IdentityUrl, null);
             }
             set
             {

src/App/Services/CryptoService.cs

@@ -78,7 +78,7 @@ namespace Bit.App.Services
             {
                 if(_encKey == null && _settings.Contains(EncKeyKey))
                 {
-                    var encKey = _settings.GetValueOrDefault<string>(EncKeyKey);
+                    var encKey = _settings.GetValueOrDefault(EncKeyKey, null);
                     var encKeyCs = new CipherString(encKey);
                     try
                     {
@@ -102,7 +102,7 @@ namespace Bit.App.Services
             {
                 if(_privateKey == null && _settings.Contains(PrivateKeyKey))
                 {
-                    var encPrivateKey = _settings.GetValueOrDefault<string>(PrivateKeyKey);
+                    var encPrivateKey = _settings.GetValueOrDefault(PrivateKeyKey, null);
                     var encPrivateKeyCs = new CipherString(encPrivateKey);
                     try
                     {
@@ -125,7 +125,7 @@ namespace Bit.App.Services
             {
                 if((!_orgKeys?.Any() ?? true) && _settings.Contains(OrgKeysKey))
                 {
-                    var orgKeysEncDictJson = _settings.GetValueOrDefault<string>(OrgKeysKey);
+                    var orgKeysEncDictJson = _settings.GetValueOrDefault(OrgKeysKey, null);
                     if(!string.IsNullOrWhiteSpace(orgKeysEncDictJson))
                     {
                         _orgKeys = new Dictionary<string, SymmetricCryptoKey>();

src/App/Services/SyncService.cs

@@ -242,8 +242,8 @@ namespace Bit.App.Services
 
         public async Task<bool> FullSyncAsync(TimeSpan syncThreshold, bool forceSync = false)
         {
-            DateTime? lastSync = _settings.GetValueOrDefault<DateTime?>(Constants.LastSync, null);
+            var lastSync = _settings.GetValueOrDefault(Constants.LastSync, DateTime.MinValue);
-            if(lastSync != null && DateTime.UtcNow - lastSync.Value < syncThreshold)
+            if(DateTime.UtcNow - lastSync < syncThreshold)
             {
                 return false;
             }
@@ -307,11 +307,11 @@ namespace Bit.App.Services
 
         private async Task<bool> NeedsToSyncAsync()
         {
-            DateTime? lastSync = _settings.GetValueOrDefault<DateTime?>(Constants.LastSync, null);
+            if(!_settings.Contains(Constants.LastSync))
-            if(!lastSync.HasValue)
             {
                 return true;
             }
+            var lastSync = _settings.GetValueOrDefault(Constants.LastSync, DateTime.MinValue);
 
             var accountRevisionDate = await _accountsApiRepository.GetAccountRevisionDateAsync();
             if(accountRevisionDate.Succeeded && accountRevisionDate.Result.HasValue &&

src/App/Utilities/Helpers.cs

@@ -44,7 +44,7 @@ namespace Bit.App.Utilities
         public static bool PerformUpdateTasks(ISettings settings, IAppInfoService appInfoService,
             IDatabaseService databaseService)
         {
-            var lastBuild = settings.GetValueOrDefault<string>(Constants.LastBuildKey);
+            var lastBuild = settings.GetValueOrDefault(Constants.LastBuildKey, null);
             if(InDebugMode() || lastBuild == null || lastBuild != appInfoService.Build)
             {
                 settings.AddOrUpdateValue(Constants.LastBuildKey, appInfoService.Build);

src/App/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="Acr.UserDialogs" version="6.3.10" targetFramework="portable45-net45+win8+wpa81" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="HockeySDK.Xamarin" version="4.1.2" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="HockeySDK.Xamarin" version="4.1.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PCLCrypto" version="2.0.147" targetFramework="portable45-net45+win8+wpa81" />
   <package id="PInvoke.BCrypt" version="0.3.152" targetFramework="portable45-net45+win8+wpa81" />
@@ -17,7 +17,7 @@
   <package id="Validation" version="2.3.7" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugin.Connectivity" version="2.3.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugin.PushNotification" version="1.2.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
-  <package id="Xam.Plugins.Settings" version="2.5.4" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xam.Plugins.Settings" version="3.0.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wpa81" />

src/iOS.Core/iOS.Core.csproj

@@ -37,21 +37,21 @@
     <Reference Include="Google.Analytics, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0.1\lib\Xamarin.iOS10\Google.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="HockeySDK, Version=1.0.6288.33981, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="HockeySDK, Version=1.0.6387.33442, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\Xamarin.iOS10\HockeySDK.dll</HintPath>
     </Reference>
     <Reference Include="HockeySDK.iOSBindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Plugin.Settings, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="SQLite-net, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\sqlite-net-pcl.1.4.118\lib\netstandard1.1\SQLite-net.dll</HintPath>

src/iOS.Core/packages.config

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HockeySDK.Xamarin" version="4.1.2" targetFramework="xamarinios10" />
+  <package id="HockeySDK.Xamarin" version="4.1.5" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
   <package id="sqlite-net-pcl" version="1.4.118" targetFramework="xamarinios10" />
   <package id="SQLitePCLRaw.bundle_green" version="1.1.8" targetFramework="xamarinios10" />
   <package id="SQLitePCLRaw.core" version="1.1.8" targetFramework="xamarinios10" />
   <package id="SQLitePCLRaw.provider.sqlite3.ios_unified" version="1.1.8" targetFramework="xamarinios10" />
-  <package id="Xam.Plugins.Settings" version="2.5.4" targetFramework="xamarinios10" />
+  <package id="Xam.Plugins.Settings" version="3.0.1" targetFramework="xamarinios10" />
   <package id="Xamarin.Build.Download" version="0.4.3" targetFramework="xamarinios10" />
   <package id="Xamarin.Google.iOS.Analytics" version="3.17.0.1" targetFramework="xamarinios10" />
   <package id="XLabs.IoC" version="2.0.5782" targetFramework="xamarinios10" />

src/iOS.Extension/iOS.Extension.csproj

@@ -274,11 +274,11 @@
     <Reference Include="Google.Analytics, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0.1\lib\Xamarin.iOS10\Google.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="HockeySDK, Version=1.0.6288.33981, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="HockeySDK, Version=1.0.6387.33442, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\Xamarin.iOS10\HockeySDK.dll</HintPath>
     </Reference>
     <Reference Include="HockeySDK.iOSBindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
@@ -316,11 +316,11 @@
     <Reference Include="Plugin.Fingerprint.Abstractions, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Plugin.Fingerprint.1.4.4\lib\Xamarin.iOS10\Plugin.Fingerprint.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="SimpleInjector, Version=4.0.7.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SimpleInjector.4.0.7\lib\netstandard1.3\SimpleInjector.dll</HintPath>

src/iOS.Extension/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="Acr.Support" version="2.1.0" targetFramework="xamarinios10" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
-  <package id="HockeySDK.Xamarin" version="4.1.2" targetFramework="xamarinios10" />
+  <package id="HockeySDK.Xamarin" version="4.1.5" targetFramework="xamarinios10" />
   <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="xamarinios10" />
   <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="xamarinios10" />
   <package id="NETStandard.Library" version="1.6.0" targetFramework="xamarinios10" />
@@ -63,7 +63,7 @@
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="xamarinios10" />
   <package id="Validation" version="2.3.7" targetFramework="xamarinios10" />
   <package id="Xam.Plugin.Connectivity" version="2.3.0" targetFramework="xamarinios10" />
-  <package id="Xam.Plugins.Settings" version="2.5.4" targetFramework="xamarinios10" />
+  <package id="Xam.Plugins.Settings" version="3.0.1" targetFramework="xamarinios10" />
   <package id="Xamarin.Build.Download" version="0.4.3" targetFramework="xamarinios10" />
   <package id="Xamarin.Google.iOS.Analytics" version="3.17.0.1" targetFramework="xamarinios10" />
   <package id="XLabs.IoC" version="2.0.5782" targetFramework="xamarinios10" />

src/iOS/iOS.csproj

@@ -289,11 +289,11 @@
     <Reference Include="Google.Analytics, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0.1\lib\Xamarin.iOS10\Google.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="HockeySDK, Version=1.0.6288.33981, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="HockeySDK, Version=1.0.6387.33442, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\Xamarin.iOS10\HockeySDK.dll</HintPath>
     </Reference>
     <Reference Include="HockeySDK.iOSBindings, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll</HintPath>
+      <HintPath>..\..\packages\HockeySDK.Xamarin.4.1.5\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
@@ -331,11 +331,11 @@
     <Reference Include="Plugin.Fingerprint.Abstractions, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Plugin.Fingerprint.1.4.4\lib\Xamarin.iOS10\Plugin.Fingerprint.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="PushNotification.Plugin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Xam.Plugin.PushNotification.1.2.4\lib\Xamarin.iOS10\PushNotification.Plugin.dll</HintPath>

src/iOS/packages.config

@@ -4,7 +4,7 @@
   <package id="Acr.UserDialogs" version="6.3.10" targetFramework="xamarinios10" />
   <package id="BTProgressHUD" version="1.2.0.3" targetFramework="xamarinios10" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
-  <package id="HockeySDK.Xamarin" version="4.1.2" targetFramework="xamarinios10" />
+  <package id="HockeySDK.Xamarin" version="4.1.5" targetFramework="xamarinios10" />
   <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="xamarinios10" />
   <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="xamarinios10" />
   <package id="NETStandard.Library" version="1.6.0" targetFramework="xamarinios10" />
@@ -68,7 +68,7 @@
   <package id="WebP.Touch" version="1.0.3" targetFramework="xamarinios10" />
   <package id="Xam.Plugin.Connectivity" version="2.3.0" targetFramework="xamarinios10" />
   <package id="Xam.Plugin.PushNotification" version="1.2.4" targetFramework="xamarinios10" developmentDependency="true" />
-  <package id="Xam.Plugins.Settings" version="2.5.4" targetFramework="xamarinios10" />
+  <package id="Xam.Plugins.Settings" version="3.0.1" targetFramework="xamarinios10" />
   <package id="Xamarin.Build.Download" version="0.4.3" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="xamarinios10" />

test/App.Test/App.Test.csproj

@@ -68,11 +68,11 @@
     <Reference Include="Plugin.Fingerprint.Abstractions, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Plugin.Fingerprint.1.4.4\lib\net45\Plugin.Fingerprint.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\net45\Plugin.Settings.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\net45\Plugin.Settings.dll</HintPath>
     </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Plugin.Settings.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xam.Plugins.Settings.2.5.4\lib\net45\Plugin.Settings.Abstractions.dll</HintPath>
+      <HintPath>..\..\packages\Xam.Plugins.Settings.3.0.1\lib\net45\Plugin.Settings.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="Validation, Version=2.3.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">

test/App.Test/packages.config

@@ -8,7 +8,7 @@
   <package id="PInvoke.Windows.Core" version="0.3.152" targetFramework="net46" />
   <package id="Plugin.Fingerprint" version="1.4.4" targetFramework="net46" />
   <package id="Validation" version="2.3.7" targetFramework="net46" />
-  <package id="Xam.Plugins.Settings" version="2.5.4" targetFramework="net46" />
+  <package id="Xam.Plugins.Settings" version="3.0.1" targetFramework="net46" />
   <package id="xunit" version="2.2.0" targetFramework="net46" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
   <package id="xunit.assert" version="2.2.0" targetFramework="net46" />