1
0
mirror of https://github.com/bitwarden/mobile.git synced 2024-06-25 10:26:02 +02:00

Merge branch 'main' into feature/maui-migration-passkeys

This commit is contained in:
Álison Fernandes 2024-04-09 21:59:31 +01:00
commit ab5e72ef83
No known key found for this signature in database
GPG Key ID: B8CE98903DFC87BC
11 changed files with 20 additions and 22 deletions

1
.github/CODEOWNERS vendored
View File

@ -21,7 +21,6 @@ src/App/Platforms/iOS/Info.plist
## Platform team files ##
appIcons @bitwarden/team-platform-dev
build.cake @bitwarden/team-platform-dev
## Vault team files ##
src/watchOS @bitwarden/team-vault-dev

View File

@ -12,7 +12,7 @@ The Bitwarden mobile application is written in C# using .NET MAUI.
# Build/Run
Please refer to the [Mobile section](https://contributing.bitwarden.com/getting-started/clients/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
Please refer to the [Mobile section](https://contributing.bitwarden.com/getting-started/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
# We're Hiring!

View File

@ -22,6 +22,7 @@ abstract record VariantConfig(
const string BASE_BUNDLE_ID_DROID = "com.x8bit.bitwarden";
const string BASE_BUNDLE_ID_IOS = "com.8bit.bitwarden";
//NOTE: Beta iOS variants have a different ITSEncryptionExportComplianceCode
record Dev(): VariantConfig("Bitwarden Dev", $"{BASE_BUNDLE_ID_DROID}.dev", $"{BASE_BUNDLE_ID_IOS}.dev", "development", "Dist:");
record QA(): VariantConfig("Bitwarden QA", $"{BASE_BUNDLE_ID_DROID}.qa", $"{BASE_BUNDLE_ID_IOS}.qa", "development", "Dist:");
record Beta(): VariantConfig("Bitwarden Beta", $"{BASE_BUNDLE_ID_DROID}.beta", $"{BASE_BUNDLE_ID_IOS}.beta", "production", "Dist: Beta");
@ -221,11 +222,9 @@ private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, Gi
plist["NSExtension"]["NSExtensionAttributes"]["NSExtensionActivationRule"] = keyText.Replace("com.8bit.bitwarden", buildVariant.iOSBundleId);
}
//TODO DEVOPS-1822 testing
if(buildVariant is Beta)
{
plist.Remove("ITSAppUsesNonExemptEncryption");
plist.Remove("ITSEncryptionExportComplianceCode");
plist["ITSEncryptionExportComplianceCode"] = "3dd3e32f-efa6-4d99-b410-28aa28b1cb77";
}
SerializePlist(plistFile, plist);

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="2024.3.3" 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="2024.4.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.NFC" />

View File

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

View File

@ -2878,12 +2878,12 @@ Você deseja mudar para esta conta?</value>
<value>Configure um método de desbloqueio para alterar o tempo limite do cofre.</value>
</data>
<data name="DuoTwoStepLoginIsRequiredForYourAccount" xml:space="preserve">
<value>Duo two-step login is required for your account. </value>
<value>A autenticação em duas etapas do Duo é necessária para sua conta. </value>
</data>
<data name="FollowTheStepsFromDuoToFinishLoggingIn" xml:space="preserve">
<value>Follow the steps from Duo to finish logging in.</value>
<value>Siga os passos no Duo para finalizar o login.</value>
</data>
<data name="LaunchDuo" xml:space="preserve">
<value>Launch Duo</value>
<value>Abrir o Duo</value>
</data>
</root>

View File

@ -641,7 +641,7 @@
<value>தற்போதைய கடவுச்சொல்லை மேலெழுத உறுதியா?</value>
</data>
<data name="PushNotificationAlert" xml:space="preserve">
<value>push அறிவிப்புகள் பயன்படுத்தி Bitwarden உம் பெட்டகத்தை தானாக ஒத்திசைகிறது. சிறந்த சாத்தியமான அனுபவத்திற்கு, பின்வரும் தூண்டியில் push அறிவிப்புகளை இயக்கச்சொல்லி கேட்டால் "அனுமதி"ஐ தேர்ந்தெடுக்கவும்.</value>
<value>Push அறிவிப்புகள் பயன்படுத்தி Bitwarden உம் பெட்டகத்தை தானாக ஒத்திசைகிறது. சிறந்த சாத்தியமான அனுபவத்திற்கு, பின்வரும் தூண்டியில் push அறிவிப்புகளை இயக்கச்சொல்லி கேட்டால் "அனுமதி"ஐ தேர்ந்தெடுக்கவும்.</value>
<comment>Push notifications for apple products</comment>
</data>
<data name="RateTheApp" xml:space="preserve">
@ -923,7 +923,7 @@
<value>இணைப்பு அழிக்கப்பட்டது</value>
</data>
<data name="ChooseFile" xml:space="preserve">
<value>கோப்பை தேர்ந்தெடு</value>
<value>கோப்பைத் தேர்ந்தெடு</value>
</data>
<data name="File" xml:space="preserve">
<value>கோப்பு</value>

View File

@ -2808,23 +2808,23 @@
<value>附加选项</value>
</data>
<data name="ContinueToWebApp" xml:space="preserve">
<value>接下来前往网页应用吗?</value>
<value>前往网页 App 吗?</value>
</data>
<data name="ContinueToX" xml:space="preserve">
<value>接下来前往 {0} 吗?</value>
<value>前往 {0} 吗?</value>
<comment>The parameter is an URL, like bitwarden.com.</comment>
</data>
<data name="ContinueToHelpCenter" xml:space="preserve">
<value>接下来前往帮助中心吗?</value>
<value>前往帮助中心吗?</value>
</data>
<data name="ContinueToContactSupport" xml:space="preserve">
<value>接下来要联系支持吗?</value>
<value>要联系支持吗?</value>
</data>
<data name="ContinueToPrivacyPolicy" xml:space="preserve">
<value>接下来查看隐私政策吗?</value>
<value>查看隐私政策吗?</value>
</data>
<data name="ContinueToAppStore" xml:space="preserve">
<value>接下来前往 App Store 吗?</value>
<value>前往 App Store 吗?</value>
</data>
<data name="TwoStepLoginDescriptionLong" xml:space="preserve">
<value>通过在 Bitwarden 网页应用中设置两步登录,可以使您的账户更加安全。</value>
@ -2874,7 +2874,7 @@
<value>您的组织要求您设置主密码。</value>
</data>
<data name="SetUpAnUnlockOptionToChangeYourVaultTimeoutAction" xml:space="preserve">
<value>设置解锁选项以更改您的密码库超时作。</value>
<value>设置解锁选项以更改您的密码库超时作。</value>
</data>
<data name="DuoTwoStepLoginIsRequiredForYourAccount" xml:space="preserve">
<value>您的账户要求使用 Duo 两步登录。 </value>

View File

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

View File

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

View File

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