diff --git a/src/Android/Services/DeviceActionService.cs b/src/Android/Services/DeviceActionService.cs index f34a24fcf..fdae6c891 100644 --- a/src/Android/Services/DeviceActionService.cs +++ b/src/Android/Services/DeviceActionService.cs @@ -153,6 +153,8 @@ namespace Bit.Android.Services return Task.FromResult(0); } + var additionalIntents = new List(); + var docIntent = new Intent(Intent.ActionOpenDocument); docIntent.AddCategory(Intent.CategoryOpenable); docIntent.SetType("*/*"); @@ -165,11 +167,15 @@ namespace Bit.Android.Services var file = new Java.IO.File(root, "temp_camera_photo.jpg"); if(!file.Exists()) { - var a = file.ParentFile.Mkdirs(); - var b = file.CreateNewFile(); + file.ParentFile.Mkdirs(); + file.CreateNewFile(); } var outputFileUri = global::Android.Net.Uri.FromFile(file); - var additionalIntents = GetCameraIntents(outputFileUri); + additionalIntents.AddRange(GetCameraIntents(outputFileUri)); + } + + if(additionalIntents.Count > 0) + { chooserIntent.PutExtra(Intent.ExtraInitialIntents, additionalIntents.ToArray()); } diff --git a/src/App/Pages/Settings/SettingsPage.cs b/src/App/Pages/Settings/SettingsPage.cs index d814ee5b2..bfdd7e06a 100644 --- a/src/App/Pages/Settings/SettingsPage.cs +++ b/src/App/Pages/Settings/SettingsPage.cs @@ -73,10 +73,16 @@ namespace Bit.App.Pages ShowDisclousure = true }; + LockCell = new ExtendedTextCell + { + Text = AppResources.Lock + }; + var securitySecion = new TableSection(AppResources.Security) { LockOptionsCell, PinCell, + LockCell, TwoStepCell }; @@ -117,11 +123,6 @@ namespace Bit.App.Pages ShowDisclousure = true }; - LockCell = new ExtendedTextCell - { - Text = AppResources.Lock - }; - LogOutCell = new ExtendedTextCell { Text = AppResources.LogOut @@ -177,18 +178,14 @@ namespace Bit.App.Pages new TableSection(AppResources.Account) { ChangeMasterPasswordCell, - ChangeEmailCell + ChangeEmailCell, + LogOutCell }, new TableSection(AppResources.Manage) { FoldersCell, SyncCell }, - new TableSection(AppResources.CurrentSession) - { - LockCell, - LogOutCell - }, otherSection } }; diff --git a/src/App/Pages/Vault/VaultAttachmentsPage.cs b/src/App/Pages/Vault/VaultAttachmentsPage.cs index 7118baddd..37227c07b 100644 --- a/src/App/Pages/Vault/VaultAttachmentsPage.cs +++ b/src/App/Pages/Vault/VaultAttachmentsPage.cs @@ -316,7 +316,7 @@ namespace Bit.App.Pages AppResources.LearnMore, AppResources.Cancel); if(confirmed) { - Device.OpenUri(new Uri("https://help.bitwarden.com")); + Device.OpenUri(new Uri("https://help.bitwarden.com/article/update-encryption-key/")); } } } diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs index 32e061c41..7a31aa6be 100644 --- a/src/App/Resources/AppResources.Designer.cs +++ b/src/App/Resources/AppResources.Designer.cs @@ -682,15 +682,6 @@ namespace Bit.App.Resources { } } - /// - /// Looks up a localized string similar to Current Session. - /// - public static string CurrentSession { - get { - return ResourceManager.GetString("CurrentSession", resourceCulture); - } - } - /// /// Looks up a localized string similar to Delete. /// diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx index 6ab7020d3..8425cc8d2 100644 --- a/src/App/Resources/AppResources.resx +++ b/src/App/Resources/AppResources.resx @@ -467,9 +467,6 @@ Creating account... Message shown when interacting with the server - - Current Session - Edit Login