parse fallback package id from first node title

* New translations AppResources.resx (French)

* New translations AppResources.resx (German)

* New translations AppResources.resx (Hungarian)

* New translations copy.resx (Hungarian)

* New translations AppResources.resx (Japanese)

* New translations AppResources.resx (Persian)

* New translations AppResources.resx (Russian)

.editorconfig

@@ -1,3 +1,112 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Don't use tabs for indentation.
+[*]
+indent_style = space
+# (Please don't specify an indent_size here; that has too many unintended consequences.)
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8-bom
+
+# Xml project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# Xml config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# JSON files
+[*.json]
+indent_size = 2
+
+# Dotnet code style settings:
+[*.{cs,vb}]
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+# Avoid "this." and "Me." if not necessary
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# Use language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Suggest more modern language features when available
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+
+# Prefix private members with underscore
+dotnet_naming_rule.private_members_with_underscore.symbols = private_members
+dotnet_naming_rule.private_members_with_underscore.style = underscore_prefix
+dotnet_naming_rule.private_members_with_underscore.severity = suggestion
+
+dotnet_naming_symbols.private_members.applicable_kinds = field
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.required_modifiers = readonly
+
+dotnet_naming_style.underscore_prefix.capitalization = camel_case
+dotnet_naming_style.underscore_prefix.required_prefix = _
+dotnet_naming_style.underscore_prefix.required_suffix = 
+dotnet_naming_style.underscore_prefix.word_separator = 
+
+# Async methods should have "Async" suffix
+dotnet_naming_rule.async_methods_end_in_async.symbols = any_async_methods
+dotnet_naming_rule.async_methods_end_in_async.style = end_in_async
+dotnet_naming_rule.async_methods_end_in_async.severity = suggestion
+
+dotnet_naming_symbols.any_async_methods.applicable_kinds = method
+dotnet_naming_symbols.any_async_methods.applicable_accessibilities = *
+dotnet_naming_symbols.any_async_methods.required_modifiers = async
+
+dotnet_naming_style.end_in_async.required_prefix = 
+dotnet_naming_style.end_in_async.required_suffix = Async
+dotnet_naming_style.end_in_async.capitalization = pascal_case
+dotnet_naming_style.end_in_async.word_separator = 
+
+# CSharp code style settings:
+[*.cs]
+# Prefer "var" everywhere
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Prefer method-like constructs to have a expression-body
+csharp_style_expression_bodied_methods = true:none
+csharp_style_expression_bodied_constructors = true:none
+csharp_style_expression_bodied_operators = true:none
+
+# Prefer property-like constructs to have an expression-body
+csharp_style_expression_bodied_properties = true:none
+csharp_style_expression_bodied_indexers = true:none
+csharp_style_expression_bodied_accessors = true:none
+
+# Suggest more modern language features when available
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Newline settings
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+
 # All files
 [*]
-guidelines = 120
+guidelines = 120

bitwarden-mobile.sln

@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "google", "google", "{2E3996
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{76690DFB-B7F4-4781-83E4-113FDC450AFE}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
 		CONTRIBUTING.md = CONTRIBUTING.md

src/Android/Android.csproj

@@ -145,6 +145,7 @@
     <Compile Include="Utilities\AndroidHelpers.cs" />
     <Compile Include="Utilities\CustomFingerprintDialogFragment.cs" />
     <Compile Include="Utilities\HockeyAppCrashManagerListener.cs" />
+    <Compile Include="Utilities\StaticStore.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\FontAwesome.ttf" />

src/Android/Autofill/Parser.cs

@@ -97,11 +97,20 @@ namespace Bit.Droid.Autofill
 
         public void Parse()
         {
+            string titlePackageId = null;
             for(var i = 0; i < _structure.WindowNodeCount; i++)
             {
                 var node = _structure.GetWindowNodeAt(i);
+                if(i == 0)
+                {
+                    titlePackageId = GetTitlePackageId(node);
+                }
                 ParseNode(node.RootViewNode);
             }
+            if(string.IsNullOrWhiteSpace(PackageName) && string.IsNullOrWhiteSpace(Website))
+            {
+                PackageName = titlePackageId;
+            }
             if(!AutofillHelpers.TrustedBrowsers.Contains(PackageName) &&
                 !AutofillHelpers.CompatBrowsers.Contains(PackageName))
             {
@@ -146,5 +155,22 @@ namespace Bit.Droid.Autofill
                 Website = string.Format("{0}://{1}", scheme, node.WebDomain);
             }
         }
+
+        private string GetTitlePackageId(WindowNode node)
+        {
+            if(node != null && !string.IsNullOrWhiteSpace(node.Title))
+            {
+                var slashPosition = node.Title.IndexOf('/');
+                if(slashPosition > -1)
+                {
+                    var packageId = node.Title.Substring(0, slashPosition);
+                    if(packageId.Contains("."))
+                    {
+                        return packageId;
+                    }
+                }
+            }
+            return null;
+        }
     }
 }

src/Android/MainActivity.cs

@@ -36,7 +36,6 @@ namespace Bit.Droid
         private IUserService _userService;
         private IAppIdService _appIdService;
         private IStorageService _storageService;
-        private IStateService _stateService;
         private IEventService _eventService;
         private PendingIntent _lockAlarmPendingIntent;
         private PendingIntent _clearClipboardPendingIntent;
@@ -67,7 +66,6 @@ namespace Bit.Droid
             _userService = ServiceContainer.Resolve<IUserService>("userService");
             _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
             _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
-            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _eventService = ServiceContainer.Resolve<IEventService>("eventService");
 
             TabLayoutResource = Resource.Layout.Tabbar;
@@ -378,7 +376,7 @@ namespace Bit.Droid
             {
                 return;
             }
-            await _stateService.SaveAsync(Constants.LastClipboardValueKey, data.Item1);
+            StaticStore.LastClipboardValue = data.Item1;
             var triggerMs = Java.Lang.JavaSystem.CurrentTimeMillis() + clearMs.Value;
             var alarmManager = GetSystemService(AlarmService) as AlarmManager;
             alarmManager.Set(AlarmType.Rtc, triggerMs, _clearClipboardPendingIntent);

src/Android/Properties/AndroidManifest.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:versionCode="1"
-  android:versionName="2.1.2"
+  android:versionName="2.2.0"
   package="com.x8bit.bitwarden">
 
   <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />

src/Android/Receivers/ClearClipboardAlarmReceiver.cs

@@ -2,22 +2,21 @@
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using Bit.Droid.Utilities;
 
 namespace Bit.Droid.Receivers
 {
     [BroadcastReceiver(Name = "com.x8bit.bitwarden.ClearClipboardAlarmReceiver", Exported = false)]
     public class ClearClipboardAlarmReceiver : BroadcastReceiver
     {
-        public async override void OnReceive(Context context, Intent intent)
+        public override void OnReceive(Context context, Intent intent)
         {
-            var stateService = ServiceContainer.Resolve<IStateService>("stateService");
             var clipboardManager = context.GetSystemService(Context.ClipboardService) as ClipboardManager;
-            var lastClipboardValue = await stateService.GetAsync<string>(Constants.LastClipboardValueKey);
-            await stateService.RemoveAsync(Constants.LastClipboardValueKey);
-            if(lastClipboardValue == clipboardManager.Text)
+            if(StaticStore.LastClipboardValue != null && StaticStore.LastClipboardValue == clipboardManager.Text)
             {
                 clipboardManager.Text = string.Empty;
             }
+            StaticStore.LastClipboardValue = null;
         }
     }
 }

src/Android/Utilities/StaticStore.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace Bit.Droid.Utilities
+{
+    public static class StaticStore
+    {
+        public static string LastClipboardValue { get; set; }
+    }
+}

src/App/App.xaml.cs

@@ -89,18 +89,7 @@ namespace Bit.App
                 }
                 else if(message.Command == "locked")
                 {
-                    await _stateService.PurgeAsync();
-                    var autoPromptFingerprint = !(message.Data as bool?).GetValueOrDefault();
-                    if(autoPromptFingerprint && Device.RuntimePlatform == Device.iOS)
-                    {
-                        var lockOptions = await _storageService.GetAsync<int?>(Constants.LockOptionKey);
-                        if(lockOptions == 0)
-                        {
-                            autoPromptFingerprint = false;
-                        }
-                    }
-                    var lockPage = new LockPage(_appOptions, autoPromptFingerprint);
-                    Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
+                    await LockedAsync(!(message.Data as bool?).GetValueOrDefault());
                 }
                 else if(message.Command == "lockVault")
                 {
@@ -398,5 +387,45 @@ namespace Bit.App
                 await _storageService.RemoveAsync(Constants.ClearCiphersCacheKey);
             }
         }
+
+        private async Task LockedAsync(bool autoPromptFingerprint)
+        {
+            await _stateService.PurgeAsync();
+            if(autoPromptFingerprint && Device.RuntimePlatform == Device.iOS)
+            {
+                var lockOptions = await _storageService.GetAsync<int?>(Constants.LockOptionKey);
+                if(lockOptions == 0)
+                {
+                    autoPromptFingerprint = false;
+                }
+            }
+            PreviousPageInfo lastPageBeforeLock = null;
+            if(Current.MainPage is TabbedPage tabbedPage && tabbedPage.Navigation.ModalStack.Count > 0)
+            {
+                var topPage = tabbedPage.Navigation.ModalStack[tabbedPage.Navigation.ModalStack.Count - 1];
+                if(topPage is NavigationPage navPage)
+                {
+                    if(navPage.CurrentPage is ViewPage viewPage)
+                    {
+                        lastPageBeforeLock = new PreviousPageInfo
+                        {
+                            Page = "view",
+                            CipherId = viewPage.ViewModel.CipherId
+                        };
+                    }
+                    else if(navPage.CurrentPage is AddEditPage addEditPage && addEditPage.ViewModel.EditMode)
+                    {
+                        lastPageBeforeLock = new PreviousPageInfo
+                        {
+                            Page = "edit",
+                            CipherId = addEditPage.ViewModel.CipherId
+                        };
+                    }
+                }
+            }
+            await _storageService.SaveAsync(Constants.PreviousPageKey, lastPageBeforeLock);
+            var lockPage = new LockPage(_appOptions, autoPromptFingerprint);
+            Device.BeginInvokeOnMainThread(() => Current.MainPage = new NavigationPage(lockPage));
+        }
     }
 }

src/App/Models/PreviousPageInfo.cs

@@ -0,0 +1,9 @@
+namespace Bit.App.Models
+{
+    public class PreviousPageInfo
+    {
+        public string Page { get; set; }
+        public string CipherId { get; set; }
+        public string SearchText { get; set; }
+    }
+}

src/App/Pages/Accounts/LockPage.xaml.cs

@@ -1,4 +1,7 @@
 using Bit.App.Models;
+using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
 using System;
 using System.Threading.Tasks;
 using Xamarin.Forms;
@@ -7,6 +10,7 @@ namespace Bit.App.Pages
 {
     public partial class LockPage : BaseContentPage
     {
+        private readonly IStorageService _storageService;
         private readonly AppOptions _appOptions;
         private readonly bool _autoPromptFingerprint;
         private readonly LockPageViewModel _vm;
@@ -16,28 +20,13 @@ namespace Bit.App.Pages
 
         public LockPage(AppOptions appOptions = null, bool autoPromptFingerprint = true)
         {
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _appOptions = appOptions;
             _autoPromptFingerprint = autoPromptFingerprint;
             InitializeComponent();
             _vm = BindingContext as LockPageViewModel;
             _vm.Page = this;
-            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(() =>
-            {
-                if(_appOptions != null)
-                {
-                    if(_appOptions.FromAutofillFramework && _appOptions.SaveType.HasValue)
-                    {
-                        Application.Current.MainPage = new NavigationPage(new AddEditPage(appOptions: _appOptions));
-                        return;
-                    }
-                    else if(_appOptions.Uri != null)
-                    {
-                        Application.Current.MainPage = new NavigationPage(new AutofillCiphersPage(_appOptions));
-                        return;
-                    }
-                }
-                Application.Current.MainPage = new TabsPage(_appOptions);
-            });
+            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());
             MasterPasswordEntry = _masterPassword;
             PinEntry = _pin;
         }
@@ -107,5 +96,28 @@ namespace Bit.App.Pages
                 await _vm.PromptFingerprintAsync();
             }
         }
+
+        private async Task UnlockedAsync()
+        {
+            if(_appOptions != null)
+            {
+                if(_appOptions.FromAutofillFramework && _appOptions.SaveType.HasValue)
+                {
+                    Application.Current.MainPage = new NavigationPage(new AddEditPage(appOptions: _appOptions));
+                    return;
+                }
+                else if(_appOptions.Uri != null)
+                {
+                    Application.Current.MainPage = new NavigationPage(new AutofillCiphersPage(_appOptions));
+                    return;
+                }
+            }
+            var previousPage = await _storageService.GetAsync<PreviousPageInfo>(Constants.PreviousPageKey);
+            if(previousPage != null)
+            {
+                await _storageService.RemoveAsync(Constants.PreviousPageKey);
+            }
+            Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
+        }
     }
 }

src/App/Pages/Accounts/TwoFactorPage.xaml

@@ -76,6 +76,9 @@
                             x:Name="_yubikeyTokenEntry"
                             Text="{Binding Token}"
                             StyleClass="box-value"
+                            IsPassword="True"
+                            IsSpellCheckEnabled="False"
+                            IsTextPredictionEnabled="False"
                             ReturnType="Go"
                             ReturnCommand="{Binding SubmitCommand}" />
                     </StackLayout>

src/App/Pages/TabsPage.cs

@@ -10,9 +10,9 @@ namespace Bit.App.Pages
         private NavigationPage _groupingsPage;
         private NavigationPage _generatorPage;
 
-        public TabsPage(AppOptions appOptions = null)
+        public TabsPage(AppOptions appOptions = null, PreviousPageInfo previousPage = null)
         {
-            _groupingsPage = new NavigationPage(new GroupingsPage(true))
+            _groupingsPage = new NavigationPage(new GroupingsPage(true, previousPage: previousPage))
             {
                 Title = AppResources.MyVault,
                 Icon = "lock.png"

src/App/Pages/Vault/AddEditPage.xaml.cs

@@ -131,6 +131,7 @@ namespace Bit.App.Pages
         }
 
         public bool FromAutofillFramework { get; set; }
+        public AddEditPageViewModel ViewModel => _vm;
 
         protected override async void OnAppearing()
         {

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs

@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Controls;
+using Bit.App.Models;
 using Bit.App.Resources;
 using Bit.Core;
 using Bit.Core.Abstractions;
@@ -22,8 +23,10 @@ namespace Bit.App.Pages
         private readonly GroupingsPageViewModel _vm;
         private readonly string _pageName;
 
+        private PreviousPageInfo _previousPage;
+
         public GroupingsPage(bool mainPage, CipherType? type = null, string folderId = null,
-            string collectionId = null, string pageTitle = null)
+            string collectionId = null, string pageTitle = null, PreviousPageInfo previousPage = null)
         {
             _pageName = string.Concat(nameof(GroupingsPage), "_", DateTime.UtcNow.Ticks);
             InitializeComponent();
@@ -41,6 +44,7 @@ namespace Bit.App.Pages
             _vm.Type = type;
             _vm.FolderId = folderId;
             _vm.CollectionId = collectionId;
+            _previousPage = previousPage;
             if(pageTitle != null)
             {
                 _vm.PageTitle = pageTitle;
@@ -125,6 +129,7 @@ namespace Bit.App.Pages
                         await _syncService.FullSyncAsync(true);
                     }
                 }
+                await ShowPreviousPageAsync();
             }, _mainContent);
 
             if(!_vm.MainPage)
@@ -244,5 +249,22 @@ namespace Bit.App.Pages
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
         }
+
+        private async Task ShowPreviousPageAsync()
+        {
+            if(_previousPage == null)
+            {
+                return;
+            }
+            if(_previousPage.Page == "view" && !string.IsNullOrWhiteSpace(_previousPage.CipherId))
+            {
+                await Navigation.PushModalAsync(new NavigationPage(new ViewPage(_previousPage.CipherId)));
+            }
+            else if(_previousPage.Page == "edit" && !string.IsNullOrWhiteSpace(_previousPage.CipherId))
+            {
+                await Navigation.PushModalAsync(new NavigationPage(new AddEditPage(_previousPage.CipherId)));
+            }
+            _previousPage = null;
+        }
     }
 }

src/App/Pages/Vault/ViewPage.xaml.cs

@@ -39,6 +39,8 @@ namespace Bit.App.Pages
             }
         }
 
+        public ViewPageViewModel ViewModel => _vm;
+
         protected override async void OnAppearing()
         {
             base.OnAppearing();

src/App/Resources/AppResources.de.resx

@@ -1564,7 +1564,7 @@
     <comment>ex. Uppercase the first character of a word.</comment>
   </data>
   <data name="IncludeNumber" xml:space="preserve">
-    <value>Zahl hinzufügen</value>
+    <value>Ziffer hinzufügen</value>
   </data>
   <data name="Download" xml:space="preserve">
     <value>Herunterladen</value>

src/App/Resources/AppResources.fa.resx

@@ -406,7 +406,7 @@
     <value>سرویس پر کردن خودکار</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>از تکرار کاراکترهای یک شکل اجتناب کن</value>
+    <value>از کاراکترهای مبهم اجتناب شود</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
     <value>افزونه اپلیکیشن Bitwarden</value>
@@ -783,7 +783,7 @@
     <value>اسکن زمانی که در فیلد پسورد متمرکز شده</value>
   </data>
   <data name="AutofillPasswordFieldDescription" xml:space="preserve">
-    <value>فقط صفحه را برای فیلدها و پیشنهاد دادن پر کردن خودکار اسکن میکند هر حتی اگر شما یک فیلد رمز عبور را انتخاب کرده باشید. این تنظیم به افزایش عمر باتری کمک میکند.</value>
+    <value>فقط زمانی که شما یک فیلد رمز عبور را انتخاب کنید صفحه را برای فیلدها و اعلانیه پیشنهاد پر کردن خودکار اسکن میکند. این تنظیم به افزایش عمر باتری کمک میکند.</value>
   </data>
   <data name="AutofillPersistNotification" xml:space="preserve">
     <value>اطلاعیه ثابت</value>

src/App/Resources/AppResources.fr.resx

@@ -222,7 +222,7 @@
     <value>Dossier supprimé.</value>
   </data>
   <data name="FolderNone" xml:space="preserve">
-    <value>Pas de dossier</value>
+    <value>Aucun dossier</value>
     <comment>Items that have no folder specified go in this special "catch-all" folder.</comment>
   </data>
   <data name="Folders" xml:space="preserve">
@@ -1548,7 +1548,7 @@
     <value>Désactiver la demande d'enregistrement</value>
   </data>
   <data name="DisableSavePromptDescription" xml:space="preserve">
-    <value>La "Demande d'enregistrement" vous invite automatiquement à enregistrer de nouveaux éléments dans votre coffre-fort à chaque fois que vous les entrez pour la première fois.</value>
+    <value>La "Demande d'enregistrement" vous invite automatiquement à enregistrer de nouveaux éléments dans votre coffre à chaque fois que vous les entrez pour la première fois.</value>
   </data>
   <data name="LockOptionOnRestart" xml:space="preserve">
     <value>Au redémarrage de l'application</value>

src/App/Resources/AppResources.hu.resx

@@ -1305,237 +1305,237 @@
     <value>The easiest way to add new logins to your vault is by using the Bitwarden Password AutoFill extension. Learn more about using the Bitwarden Password AutoFill extension by navigating to the "Settings" screen.</value>
   </data>
   <data name="InvalidEmail" xml:space="preserve">
-    <value>Invalid email address.</value>
+    <value>Érvénytelen e-mail cím.</value>
   </data>
   <data name="Cards" xml:space="preserve">
-    <value>Cards</value>
+    <value>Kártyák</value>
   </data>
   <data name="Identities" xml:space="preserve">
-    <value>Identities</value>
+    <value>Azonosságok</value>
   </data>
   <data name="Logins" xml:space="preserve">
-    <value>Logins</value>
+    <value>Bejelentkezések</value>
   </data>
   <data name="SecureNotes" xml:space="preserve">
-    <value>Secure Notes</value>
+    <value>Biztonságos jegyzetek</value>
   </data>
   <data name="AllItems" xml:space="preserve">
-    <value>All Items</value>
+    <value>Összes elem</value>
   </data>
   <data name="URIs" xml:space="preserve">
-    <value>URIs</value>
+    <value>URI-k</value>
     <comment>Plural form of a URI</comment>
   </data>
   <data name="CheckingPassword" xml:space="preserve">
-    <value>Checking password...</value>
+    <value>Jelszó ellenőrzése...</value>
     <comment>A loading message when doing an exposed password check.</comment>
   </data>
   <data name="CheckPassword" xml:space="preserve">
-    <value>Check if password has been exposed.</value>
+    <value>Ellenőrizd, hogy kompromittálódott-e a jelszó.</value>
   </data>
   <data name="PasswordExposed" xml:space="preserve">
-    <value>This password has been exposed {0} time(s) in data breaches. You should change it.</value>
+    <value>Ez a jelszó {0} alkalommal kompromittálódott adatszivárgásban. Változtasd meg!</value>
   </data>
   <data name="PasswordSafe" xml:space="preserve">
-    <value>This password was not found in any known data breaches. It should be safe to use.</value>
+    <value>Ez a jelszó nem érintett egyetlen ismert adatszivárgásban sem. Biztonságos a használata.</value>
   </data>
   <data name="IdentityName" xml:space="preserve">
-    <value>Identity Name</value>
+    <value>Identitásnév</value>
   </data>
   <data name="Value" xml:space="preserve">
-    <value>Value</value>
+    <value>Érték</value>
   </data>
   <data name="PasswordHistory" xml:space="preserve">
-    <value>Password History</value>
+    <value>Jelszó előzmények</value>
   </data>
   <data name="Types" xml:space="preserve">
-    <value>Types</value>
+    <value>Típusok</value>
   </data>
   <data name="NoPasswordsToList" xml:space="preserve">
-    <value>No passwords to list.</value>
+    <value>Nincs megjeleníthető jelszó.</value>
   </data>
   <data name="NoItemsToList" xml:space="preserve">
-    <value>There are no items to list.</value>
+    <value>Nincsenek megjeleníthető tételek.</value>
   </data>
   <data name="SearchCollection" xml:space="preserve">
-    <value>Search collection</value>
+    <value>Gyűjtemény keresése</value>
   </data>
   <data name="SearchFolder" xml:space="preserve">
-    <value>Search folder</value>
+    <value>Mappa keresése</value>
   </data>
   <data name="SearchType" xml:space="preserve">
-    <value>Search type</value>
+    <value>Típus keresése</value>
   </data>
   <data name="Type" xml:space="preserve">
-    <value>Type</value>
+    <value>Típus</value>
   </data>
   <data name="MoveDown" xml:space="preserve">
-    <value>Move Down</value>
+    <value>Lefelé mozgatás</value>
   </data>
   <data name="MoveUp" xml:space="preserve">
-    <value>Move Up</value>
+    <value>Mozgatás felfelé</value>
   </data>
   <data name="Miscellaneous" xml:space="preserve">
-    <value>Miscellaneous</value>
+    <value>Egyebek</value>
   </data>
   <data name="Ownership" xml:space="preserve">
-    <value>Ownership</value>
+    <value>Tulajdonjog</value>
   </data>
   <data name="WhoOwnsThisItem" xml:space="preserve">
-    <value>Who owns this item?</value>
+    <value>Kié ez a tétel?</value>
   </data>
   <data name="NoCollectionsToList" xml:space="preserve">
-    <value>There are no collections to list.</value>
+    <value>Nincsenek megjeleníthető gyűjtemények.</value>
   </data>
   <data name="ItemShared" xml:space="preserve">
-    <value>Item has been shared.</value>
+    <value>Elem meg lett osztva.</value>
   </data>
   <data name="SelectOneCollection" xml:space="preserve">
-    <value>You must select at least one collection.</value>
+    <value>Legalább egy gyűjteményt ki kell választanod.</value>
   </data>
   <data name="Share" xml:space="preserve">
-    <value>Share</value>
+    <value>Megosztás</value>
   </data>
   <data name="ShareItem" xml:space="preserve">
-    <value>Share Item</value>
+    <value>Elem megosztása</value>
   </data>
   <data name="NoOrgsToList" xml:space="preserve">
-    <value>No organizations to list.</value>
+    <value>Nincs megjeleníthető szervezet.</value>
   </data>
   <data name="ShareDesc" xml:space="preserve">
     <value>Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared.</value>
   </data>
   <data name="NumberOfWords" xml:space="preserve">
-    <value>Number of Words</value>
+    <value>Szavak száma</value>
   </data>
   <data name="Passphrase" xml:space="preserve">
-    <value>Passphrase</value>
+    <value>Kulcsszó</value>
   </data>
   <data name="WordSeparator" xml:space="preserve">
-    <value>Word Separator</value>
+    <value>Szó elválasztó</value>
   </data>
   <data name="Clear" xml:space="preserve">
-    <value>Clear</value>
+    <value>Töröl</value>
     <comment>To clear something out. example: To clear browser history.</comment>
   </data>
   <data name="Generator" xml:space="preserve">
-    <value>Generator</value>
+    <value>Generátor</value>
     <comment>Short for "Password Generator"</comment>
   </data>
   <data name="NoFoldersToList" xml:space="preserve">
-    <value>There are no folders to list.</value>
+    <value>Nincsenek megjeleníthető mappák.</value>
   </data>
   <data name="FingerprintPhrase" xml:space="preserve">
-    <value>Fingerprint Phrase</value>
+    <value>Ujjlenyomat mondat</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="YourAccountsFingerprint" xml:space="preserve">
-    <value>Your account's fingerprint phrase</value>
+    <value>A fiókod ujjlenyomat mondata</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
   <data name="ShareVaultConfirmation" xml:space="preserve">
-    <value>Bitwarden allows you to share your vault with others by using an organization account. Would you like to visit the bitwarden.com website to learn more?</value>
+    <value>Bitwarden lehetővé teszi egy szervezeti fiók használatával a fiók megosztását másokkal. Szeretnél többet megtudni a bitwarden.com weboldalon?</value>
   </data>
   <data name="ExportVault" xml:space="preserve">
-    <value>Export Vault</value>
+    <value>Széf exportálása</value>
   </data>
   <data name="LockNow" xml:space="preserve">
-    <value>Lock Now</value>
+    <value>Zárolás most</value>
   </data>
   <data name="PIN" xml:space="preserve">
     <value>PIN</value>
   </data>
   <data name="Unlock" xml:space="preserve">
-    <value>Unlock</value>
+    <value>Feloldás</value>
   </data>
   <data name="LockOption30Minutes" xml:space="preserve">
-    <value>30 minutes</value>
+    <value>30 perc</value>
   </data>
   <data name="LockOption5Minutes" xml:space="preserve">
-    <value>5 minutes</value>
+    <value>5 perc</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
     <value>Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application.</value>
   </data>
   <data name="LoggedInAsOn" xml:space="preserve">
-    <value>Logged in as {0} on {1}.</value>
+    <value>Bejelentkezve, mint {0} - {1}.</value>
     <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
   </data>
   <data name="VaultLockedMasterPassword" xml:space="preserve">
-    <value>Your vault is locked. Verify your master password to continue.</value>
+    <value>A széfed zárolva van. A folytatáshoz add meg a mesterjelszót.</value>
   </data>
   <data name="VaultLockedPIN" xml:space="preserve">
-    <value>Your vault is locked. Verify your PIN code to continue.</value>
+    <value>A széfed zárolva van. A folytatáshoz add meg a PIN kódot.</value>
   </data>
   <data name="Dark" xml:space="preserve">
-    <value>Dark</value>
+    <value>Sötét</value>
     <comment>A dark color</comment>
   </data>
   <data name="Light" xml:space="preserve">
-    <value>Light</value>
+    <value>Világos</value>
     <comment>A light color</comment>
   </data>
   <data name="FiveMinutes" xml:space="preserve">
-    <value>5 minutes</value>
+    <value>5 perc</value>
   </data>
   <data name="OneMinute" xml:space="preserve">
-    <value>1 minute</value>
+    <value>1 perc</value>
   </data>
   <data name="TenSeconds" xml:space="preserve">
-    <value>10 seconds</value>
+    <value>10 másodperc</value>
   </data>
   <data name="ThirtySeconds" xml:space="preserve">
-    <value>30 seconds</value>
+    <value>30 másodperc</value>
   </data>
   <data name="TwentySeconds" xml:space="preserve">
-    <value>20 seconds</value>
+    <value>20 másodperc</value>
   </data>
   <data name="TwoMinutes" xml:space="preserve">
-    <value>2 minutes</value>
+    <value>2 perc</value>
   </data>
   <data name="ClearClipboard" xml:space="preserve">
-    <value>Clear Clipboard</value>
+    <value>Vágólap ürítése</value>
     <comment>Clipboard is the operating system thing where you copy/paste data to on your device.</comment>
   </data>
   <data name="ClearClipboardDescription" xml:space="preserve">
-    <value>Automatically clear copied values from your clipboard.</value>
+    <value>Automatikusan törli a vágólapra másolt értékeket.</value>
     <comment>Clipboard is the operating system thing where you copy/paste data to on your device.</comment>
   </data>
   <data name="DefaultUriMatchDetection" xml:space="preserve">
-    <value>Default URI Match Detection</value>
+    <value>Alapértelmezett találatfelismerés</value>
     <comment>Default URI match detection for auto-fill.</comment>
   </data>
   <data name="DefaultUriMatchDetectionDescription" xml:space="preserve">
     <value>Choose the default way that URI match detection is handled for logins when performing actions such as auto-fill.</value>
   </data>
   <data name="Theme" xml:space="preserve">
-    <value>Theme</value>
+    <value>Téma</value>
     <comment>Color theme</comment>
   </data>
   <data name="ThemeDescription" xml:space="preserve">
-    <value>Change the application's color theme.</value>
+    <value>Az alkalmazás színének megváltoztatása.</value>
   </data>
   <data name="RestartIsRequired" xml:space="preserve">
-    <value>Restart is required.</value>
+    <value>Újraindítás szükséges.</value>
     <comment>Referring to restarting the application.</comment>
   </data>
   <data name="Restarting" xml:space="preserve">
-    <value>Restarting...</value>
+    <value>Újraindítás...</value>
   </data>
   <data name="CopyNotes" xml:space="preserve">
-    <value>Copy Notes</value>
+    <value>Jegyzetek másolása</value>
   </data>
   <data name="Exit" xml:space="preserve">
-    <value>Exit</value>
+    <value>Kilépés</value>
   </data>
   <data name="ExitConfirmation" xml:space="preserve">
-    <value>Are you sure you want to exit Bitwarden?</value>
+    <value>Biztos vagy benne, hogy kilépsz?</value>
   </data>
   <data name="PINRequireMasterPasswordRestart" xml:space="preserve">
     <value>You you want to require unlocking with your master password when the application is restarted?</value>
   </data>
   <data name="Black" xml:space="preserve">
-    <value>Black</value>
+    <value>Fekete</value>
     <comment>The color black</comment>
   </data>
   <data name="BlacklistedUris" xml:space="preserve">
@@ -1551,7 +1551,7 @@
     <value>The "Save Prompt" automatically prompts you to save new items to your vault whenever you enter them for the first time.</value>
   </data>
   <data name="LockOptionOnRestart" xml:space="preserve">
-    <value>On App Restart</value>
+    <value>Újraindításkor</value>
   </data>
   <data name="AutofillServiceNotEnabled" xml:space="preserve">
     <value>Auto-fill makes it easy to securely access your Bitwarden vault from other websites and apps. It looks like you have not enabled an auto-fill service for Bitwarden. Enable auto-fill for Bitwarden from the "Settings" screen.</value>
@@ -1560,17 +1560,17 @@
     <value>Your theme changes will apply when the app is restarted.</value>
   </data>
   <data name="Capitalize" xml:space="preserve">
-    <value>Capitalize</value>
+    <value>Nagy kezdőbetű</value>
     <comment>ex. Uppercase the first character of a word.</comment>
   </data>
   <data name="IncludeNumber" xml:space="preserve">
-    <value>Include Number</value>
+    <value>Tartalmazzon számot</value>
   </data>
   <data name="Download" xml:space="preserve">
-    <value>Download</value>
+    <value>Letöltés</value>
   </data>
   <data name="Shared" xml:space="preserve">
-    <value>Shared</value>
+    <value>Megosztott</value>
   </data>
   <data name="ToggleVisibility" xml:space="preserve">
     <value>Toggle Visiblity</value>

src/App/Resources/AppResources.ja.resx

@@ -412,7 +412,7 @@
     <value>Bitwarden App Extension</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
-    <value>Bitwarden App Extension から新しいログイン情報を保管庫に追加するのが一番簡単です。設定画面で App Extension の詳細を確認できます。</value>
+    <value>ログイン情報を保管庫に追加する一番簡単な方法はApp Extensionを使うことです。詳しくは「設定」画面に進んでください。</value>
   </data>
   <data name="BitwardenAppExtensionDescription" xml:space="preserve">
     <value>Safari などのアプリで Bitwarden を使ってログイン情報を自動入力します。</value>
@@ -1419,7 +1419,7 @@
     <comment>To clear something out. example: To clear browser history.</comment>
   </data>
   <data name="Generator" xml:space="preserve">
-    <value>ジェネレーター</value>
+    <value>パスワード生成</value>
     <comment>Short for "Password Generator"</comment>
   </data>
   <data name="NoFoldersToList" xml:space="preserve">

src/App/Resources/AppResources.ru.resx

@@ -356,7 +356,7 @@
     <comment>Validation message for when a form field is left blank and is required to be entered.</comment>
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
-    <value>{0} скопирован(о).</value>
+    <value>{0} скопирован(-о).</value>
     <comment>Confirmation message after suceessfully copying a value to the clipboard.</comment>
   </data>
   <data name="VerifyFingerprint" xml:space="preserve">
@@ -874,7 +874,7 @@
     <comment>The placeholder will show the file size of the attachment. Ex "25 MB"</comment>
   </data>
   <data name="AuthenticatorKey" xml:space="preserve">
-    <value>Ключ аутентификатора (TOTP)</value>
+    <value>Ключ проверки подлинности (TOTP)</value>
   </data>
   <data name="VerificationCodeTotp" xml:space="preserve">
     <value>Код подтверждения (TOTP)</value>
@@ -905,7 +905,7 @@
     <value>Копировать TOTP</value>
   </data>
   <data name="DisableAutoTotpCopyDescription" xml:space="preserve">
-    <value>Если к вашему логину прикреплен ключ аутентификации, то код подтверждения TOTP будет скопирован при автозаполнении логина.</value>
+    <value>Если к вашему логину прикреплен ключ проверки подлинности, то код подтверждения TOTP будет скопирован при автозаполнении логина.</value>
   </data>
   <data name="DisableAutoTotpCopy" xml:space="preserve">
     <value>Отключить копирование TOTP</value>
@@ -1334,7 +1334,7 @@
     <value>Проверьте, не скомпрометирован ли пароль.</value>
   </data>
   <data name="PasswordExposed" xml:space="preserve">
-    <value>Этот пароль был найден в базах утечек {0} раз(а). Вы должны изменить его.</value>
+    <value>Этот пароль был найден в базах утечек {0} раз(-а). Вы должны изменить его.</value>
   </data>
   <data name="PasswordSafe" xml:space="preserve">
     <value>Этот пароль не был найден в известных базах утечек. Можно продолжать его использовать.</value>
@@ -1458,7 +1458,7 @@
     <value>Установите PIN-код для разблокировки Bitwarden. Настройки PIN-кода будут сброшены, если вы когда-либо полностью выйдете из приложения.</value>
   </data>
   <data name="LoggedInAsOn" xml:space="preserve">
-    <value>Вы вошли как {0} на {1}.</value>
+    <value>Выполнен вход на {1} как {0}.</value>
     <comment>ex: Logged in as user@example.com on bitwarden.com.</comment>
   </data>
   <data name="VaultLockedMasterPassword" xml:space="preserve">

src/Core/Constants.cs

@@ -24,7 +24,6 @@
         public static string PushInitialPromptShownKey = "pushInitialPromptShown";
         public static string ThemeKey = "theme";
         public static string ClearClipboardKey = "clearClipboard";
-        public static string LastClipboardValueKey = "lastClipboardValue";
         public static string LastBuildKey = "lastBuild";
         public static string OldUserIdKey = "userId";
         public static string AddSitePromptShownKey = "addSitePromptShown";
@@ -33,6 +32,7 @@
         public static string MigratedFromV1AutofillPromptShown = "migratedV1AutofillPromptShown";
         public static string TriedV1Resync = "triedV1Resync";
         public static string EventCollectionKey = "eventCollection";
+        public static string PreviousPageKey = "previousPage";
         public const int SelectFileRequestCode = 42;
         public const int SelectFilePermissionRequestCode = 43;
     }

src/Core/Services/EventService.cs

@@ -31,8 +31,6 @@ namespace Bit.Core.Services
 
         public async Task CollectAsync(EventType eventType, string cipherId = null, bool uploadImmediately = false)
         {
-            return;
-            // TODO
             var authed = await _userService.IsAuthenticatedAsync();
             if(!authed)
             {
@@ -76,8 +74,6 @@ namespace Bit.Core.Services
 
         public async Task UploadEventsAsync()
         {
-            return;
-            // TODO
             var authed = await _userService.IsAuthenticatedAsync();
             if(!authed)
             {

src/Core/Utilities/ExtendedObservableCollection.cs

@@ -30,7 +30,16 @@ namespace Bit.Core.Utilities
 
         public void ResetWithRange(IEnumerable<T> range)
         {
-            Items.Clear();
+            // Maybe a fix for https://forums.xamarin.com/discussion/19114/invalid-number-of-rows-in-section
+            // Items.Clear();
+            if(Items.Count > 0)
+            {
+                var count = Items.Count;
+                for(var i = 0; i < count; i++)
+                {
+                    Items.RemoveAt(0);
+                }
+            }
             AddRange(range);
         }
     }

src/iOS.Autofill/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.2</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>53</string>
+	<string>54</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>

src/iOS.Core/Services/KeyChainStorageService.cs

@@ -34,9 +34,9 @@ namespace Bit.iOS.Core.Services
             var formattedKey = string.Format(_keyFormat, appId, key);
             byte[] dataBytes = null;
             using(var existingRecord = GetKeyRecord(formattedKey))
-            using(var record = SecKeyChain.QueryAsRecord(existingRecord, out SecStatusCode resultCode))
+            using(var record = SecKeyChain.QueryAsRecord(existingRecord, out var resultCode))
             {
-                if(resultCode == SecStatusCode.ItemNotFound)
+                if(resultCode == SecStatusCode.ItemNotFound || resultCode == SecStatusCode.InteractionNotAllowed)
                 {
                     return (T)(object)null;
                 }
@@ -116,7 +116,7 @@ namespace Bit.iOS.Core.Services
         private SecRecord GetExistingRecord(string key)
         {
             var existingRecord = GetKeyRecord(key);
-            SecKeyChain.QueryAsRecord(existingRecord, out SecStatusCode resultCode);
+            SecKeyChain.QueryAsRecord(existingRecord, out var resultCode);
             return resultCode == SecStatusCode.Success ? existingRecord : null;
         }
 

src/iOS.Extension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.2</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>53</string>
+	<string>54</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>

src/iOS/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.2</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>53</string>
+	<string>54</string>
 	<key>CFBundleIconName</key>
 	<string>AppIcon</string>
 	<key>CFBundleURLTypes</key>

store/google/hu/copy.resx

@@ -118,11 +118,11 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Title" xml:space="preserve">
-    <value>bitwarden Jelszókezelő</value>
+    <value>Bitwarden Jelszó Kezelő</value>
     <comment>Max 30 characters</comment>
   </data>
   <data name="ShortDescription" xml:space="preserve">
-    <value>A bitwarden egy jelszókezelő app, mely biztonságban tart amikor online vagy.</value>
+    <value>Bitwarden egy bejelentkezés és jelszó kezelő, amely segít neked biztonságban lenni, amíg online vagy.</value>
     <comment>Max 80 characters</comment>
   </data>
   <data name="FullDesciption" xml:space="preserve">