bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-15 15:03:19 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into feature/totp-tab

Browse Source 
# Conflicts:
#	src/App/Resources/AppResources.Designer.cs
#	src/App/Resources/AppResources.resx
This commit is contained in:
André Bispo
2022-07-07 17:13:04 +01:00
parent 9074f533f9 7802da2b9c
commit a57dc50a50
8 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Android/Properties/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2022.6.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2022.6.2" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>

11
src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
View File

@@ -257,6 +257,17 @@ namespace Bit.App.Pages
}
var cleanSelection = selection.Replace("✓ ", string.Empty);
var selectionOption = _vaultTimeouts.FirstOrDefault(o => o.Key == cleanSelection);
// Check if the selected Timeout action is "Never" and if it's different from the previous selected value
if (selectionOption.Value == null && selectionOption.Value != oldTimeout)
{
var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.NeverLockWarning,
AppResources.Warning, AppResources.Yes, AppResources.Cancel);
if (!confirmed)
{
return;
}
}
_vaultTimeoutDisplayValue = selectionOption.Key;
newTimeout = selectionOption.Value;
}

8
src/App/Resources/AppResources.Designer.cs generated
View File

@@ -4106,5 +4106,13 @@ namespace Bit.App.Resources {
return ResourceManager.GetString("SelectAddTotpToStoreTheKeySafely", resourceCulture);
}
}
public static string NeverLockWarning
{
get
{
return ResourceManager.GetString("NeverLockWarning", resourceCulture);
}
}
}
}

3
src/App/Resources/AppResources.resx
View File

@@ -2291,4 +2291,7 @@
<data name="SelectAddTotpToStoreTheKeySafely" xml:space="preserve">
<value>select Add TOTP to store the key safely</value>
</data>
<data name="NeverLockWarning" xml:space="preserve">
<value>Setting your lock options to “Never” keeps your vault available to anyone with access to your device. If you use this option, you should ensure that you keep your device properly protected.</value>
</data>
</root>

2
src/iOS.Autofill/Info.plist
View File

@@ -11,7 +11,7 @@
<key>CFBundleIdentifier</key>
<string>com.8bit.bitwarden.autofill</string>
<key>CFBundleShortVersionString</key>
<string>2022.6.1</string>
<string>2022.6.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CFBundleLocalizations</key>

2
src/iOS.Extension/Info.plist
View File

@@ -11,7 +11,7 @@
<key>CFBundleIdentifier</key>
<string>com.8bit.bitwarden.find-login-action-extension</string>
<key>CFBundleShortVersionString</key>
<string>2022.6.1</string>
<string>2022.6.2</string>
<key>CFBundleLocalizations</key>
<array>
<string>en</string>

2
src/iOS.ShareExtension/Info.plist
View File

@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>2022.6.1</string>
<string>2022.6.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>MinimumOSVersion</key>

2
src/iOS/Info.plist
View File

@@ -11,7 +11,7 @@
<key>CFBundleIdentifier</key>
<string>com.8bit.bitwarden</string>
<key>CFBundleShortVersionString</key>
<string>2022.6.1</string>
<string>2022.6.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CFBundleIconName</key>