mirror of
https://github.com/bitwarden/mobile
synced 2026-02-05 19:13:15 +00:00
Compare commits
2 Commits
vault/pm-2
...
vault/pm-9
| Author | SHA1 | Date | |
|---|---|---|---|
|
13c9f3f0d2 | ||
|
|
0968c456e4 |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -733,7 +733,7 @@ jobs:
|
||||
secrets: "crowdin-api-token"
|
||||
|
||||
- name: Upload Sources
|
||||
uses: crowdin/github-action@61ac8b980551f674046220c3e104bddae2916ac5 # v2.0.0
|
||||
uses: crowdin/github-action@30849777a3cba6ee9a09e24e195272b8287a0a5b # v1.20.4
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
|
||||
|
||||
2
.github/workflows/crowdin-pull.yml
vendored
2
.github/workflows/crowdin-pull.yml
vendored
@@ -30,7 +30,7 @@ jobs:
|
||||
secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
|
||||
|
||||
- name: Download translations
|
||||
uses: crowdin/github-action@61ac8b980551f674046220c3e104bddae2916ac5 # v2.0.0
|
||||
uses: crowdin/github-action@30849777a3cba6ee9a09e24e195272b8287a0a5b # v1.20.4
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
|
||||
|
||||
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
@@ -67,7 +67,7 @@ jobs:
|
||||
|
||||
- name: Download all artifacts
|
||||
if: ${{ inputs.release_type != 'Dry Run' }}
|
||||
uses: bitwarden/gh-actions/download-artifacts@main
|
||||
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
|
||||
with:
|
||||
workflow: build.yml
|
||||
workflow_conclusion: success
|
||||
@@ -75,7 +75,7 @@ jobs:
|
||||
|
||||
- name: Dry Run - Download all artifacts
|
||||
if: ${{ inputs.release_type == 'Dry Run' }}
|
||||
uses: bitwarden/gh-actions/download-artifacts@main
|
||||
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
|
||||
with:
|
||||
workflow: build.yml
|
||||
workflow_conclusion: success
|
||||
@@ -129,7 +129,7 @@ jobs:
|
||||
|
||||
- name: Download F-Droid .apk artifact
|
||||
if: ${{ inputs.release_type != 'Dry Run' }}
|
||||
uses: bitwarden/gh-actions/download-artifacts@main
|
||||
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
|
||||
with:
|
||||
workflow: build.yml
|
||||
workflow_conclusion: success
|
||||
@@ -138,7 +138,7 @@ jobs:
|
||||
|
||||
- name: Dry Run - Download F-Droid .apk artifact
|
||||
if: ${{ inputs.release_type == 'Dry Run' }}
|
||||
uses: bitwarden/gh-actions/download-artifacts@main
|
||||
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
|
||||
with:
|
||||
workflow: build.yml
|
||||
workflow_conclusion: success
|
||||
|
||||
@@ -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.6.0" 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.5.2" 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" />
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.8bit.bitwarden</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>2024.6.0</string>
|
||||
<string>2024.5.2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>CFBundleIconName</key>
|
||||
|
||||
@@ -422,7 +422,7 @@
|
||||
<value>خدمة التعبئة التلقائية</value>
|
||||
</data>
|
||||
<data name="SetBitwardenAsPasskeyManagerDescription" xml:space="preserve">
|
||||
<value>تعيين Bitwarden كموفر مفتاح المرور الخاص بك في إعدادات الجهاز.</value>
|
||||
<value>Set Bitwarden as your passkey provider in device settings.</value>
|
||||
</data>
|
||||
<data name="AvoidAmbiguousCharacters" xml:space="preserve">
|
||||
<value>تجنب الأحرف الغامضة</value>
|
||||
|
||||
@@ -1662,7 +1662,7 @@ Nolasīšana notiks automātiski.</value>
|
||||
<value>Jāapstiprina identitāte, lai turpinātu.</value>
|
||||
</data>
|
||||
<data name="ExportVaultWarning" xml:space="preserve">
|
||||
<value>Šī izguve satur glabātavas datus nešifrētā veidā. Izgūto datni nevajadzētu glabāt vai sūtīt nedrošos veidos (piemēram, e-pastā). Tā ir jāizdzēš uzreiz pēc izmantošanas.</value>
|
||||
<value>Šī izguve satur glabātavas datus nešifrētā veidā. Izdoto datni nevajadzētu glabāt vai sūtīt nedrošos veidos (piemēram, e-pastā). Izdzēst to uzreiz pēc izmantošanas.</value>
|
||||
</data>
|
||||
<data name="EncExportKeyWarning" xml:space="preserve">
|
||||
<value>Šī izguve šifrē datus ar konta šifrēšanas atslēgu. Ja tā jebkad tiks mainīta, izvadi vajadzētu veikt vēlreiz, jo vairs nebūs iespējams atšifrēt šo datni.</value>
|
||||
|
||||
@@ -961,7 +961,7 @@ A leitura será efetuada automaticamente.</value>
|
||||
<value>Ambiente personalizado</value>
|
||||
</data>
|
||||
<data name="CustomEnvironmentFooter" xml:space="preserve">
|
||||
<value>Para utilizadores avançados. Pode especificar o URL de base de cada serviço de forma independente.</value>
|
||||
<value>Para utilizadores avançados. Pode especificar o URL de base de cada serviço independentemente.</value>
|
||||
</data>
|
||||
<data name="EnvironmentSaved" xml:space="preserve">
|
||||
<value>Os URLs de ambiente foram guardados.</value>
|
||||
|
||||
@@ -2897,19 +2897,19 @@ Vill du byta till detta konto?</value>
|
||||
<value>Choose a login to save this passkey to</value>
|
||||
</data>
|
||||
<data name="SavePasskeyAsNewLogin" xml:space="preserve">
|
||||
<value>Spara passkey som ny inloggning</value>
|
||||
<value>Save passkey as new login</value>
|
||||
</data>
|
||||
<data name="SavePasskey" xml:space="preserve">
|
||||
<value>Spara passkey</value>
|
||||
<value>Save passkey</value>
|
||||
</data>
|
||||
<data name="PasskeysForX" xml:space="preserve">
|
||||
<value>Passkeys för {0}</value>
|
||||
<value>Passkeys for {0}</value>
|
||||
</data>
|
||||
<data name="PasswordsForX" xml:space="preserve">
|
||||
<value>Lösenord för {0}</value>
|
||||
<value>Passwords for {0}</value>
|
||||
</data>
|
||||
<data name="OverwritePasskey" xml:space="preserve">
|
||||
<value>Skriv över passkey?</value>
|
||||
<value>Overwrite passkey?</value>
|
||||
</data>
|
||||
<data name="ThisItemAlreadyContainsAPasskeyAreYouSureYouWantToOverwriteTheCurrentPasskey" xml:space="preserve">
|
||||
<value>This item already contains a passkey. Are you sure you want to overwrite the current passkey?</value>
|
||||
@@ -2924,16 +2924,16 @@ Vill du byta till detta konto?</value>
|
||||
<value>Starta Duo</value>
|
||||
</data>
|
||||
<data name="VerificationRequiredByX" xml:space="preserve">
|
||||
<value>Verifiering krävs av {0}</value>
|
||||
<value>Verification required by {0}</value>
|
||||
</data>
|
||||
<data name="VerificationRequiredForThisActionSetUpAnUnlockMethodInBitwardenToContinue" xml:space="preserve">
|
||||
<value>Verification required for this action. Set up an unlock method in Bitwarden to continue.</value>
|
||||
</data>
|
||||
<data name="ErrorCreatingPasskey" xml:space="preserve">
|
||||
<value>Fel vid skapande av passkey</value>
|
||||
<value>Error creating passkey</value>
|
||||
</data>
|
||||
<data name="ErrorReadingPasskey" xml:space="preserve">
|
||||
<value>Fel vid läsning av passkey</value>
|
||||
<value>Error reading passkey</value>
|
||||
</data>
|
||||
<data name="ThereWasAProblemCreatingAPasskeyForXTryAgainLater" xml:space="preserve">
|
||||
<value>There was a problem creating a passkey for {0}. Try again later.</value>
|
||||
@@ -2944,7 +2944,7 @@ Vill du byta till detta konto?</value>
|
||||
<comment>The parameter is the RpId</comment>
|
||||
</data>
|
||||
<data name="VerifyingIdentityEllipsis" xml:space="preserve">
|
||||
<value>Verifierar identitet...</value>
|
||||
<value>Verifying identity...</value>
|
||||
</data>
|
||||
<data name="Passwords" xml:space="preserve">
|
||||
<value>Lösenord</value>
|
||||
@@ -2965,22 +2965,22 @@ Vill du byta till detta konto?</value>
|
||||
<value>1. Gå till din enhets Inställningar > Lösenord > Lösenordsalternativ</value>
|
||||
</data>
|
||||
<data name="SecondDotTurnOnAutoFill" xml:space="preserve">
|
||||
<value>2. Slå på AutoFyll</value>
|
||||
<value>2. Turn on AutoFill</value>
|
||||
</data>
|
||||
<data name="ThirdDotSelectBitwardenToUseForPasswordsAndPasskeys" xml:space="preserve">
|
||||
<value>3. Välj att använda "Bitwarden" för lösenord och passkeys</value>
|
||||
<value>3. Select "Bitwarden" to use for passwords and passkeys</value>
|
||||
</data>
|
||||
<data name="YourPasskeyWillBeSavedToYourBitwardenVault" xml:space="preserve">
|
||||
<value>Your passkey will be saved to your Bitwarden vault</value>
|
||||
</data>
|
||||
<data name="YourPasskeyWillBeSavedToYourBitwardenVaultForX" xml:space="preserve">
|
||||
<value>Din passkey kommer att sparas i ditt Bitwarden-valv för {0}</value>
|
||||
<value>Your passkey will be saved to your Bitwarden vault for {0}</value>
|
||||
</data>
|
||||
<data name="OrganizationUnassignedItemsMessageUSEUDescriptionLong" xml:space="preserve">
|
||||
<value>Unassigned organization items are no longer visible in the All Vaults view and only accessible via the Admin Console. Assign these items to a collection from the Admin Console to make them visible.</value>
|
||||
</data>
|
||||
<data name="OrganizationUnassignedItemsMessageSelfHost041624DescriptionLong" xml:space="preserve">
|
||||
<value>Den 16 maj 2024 kommer otilldelade organisationsobjekt inte längre att synas i alla valvs-vyn och endast nås via administratörskonsollen. Tilldela dessa objekt till en samling från administratörskonsollen för att göra dem synliga.</value>
|
||||
<value>On May 16, 2024, unassigned organization items will no longer be visible in the All Vaults view and only accessible via the Admin Console. Assign these items to a collection from the Admin Console to make them visible.</value>
|
||||
</data>
|
||||
<data name="RemindMeLater" xml:space="preserve">
|
||||
<value>Påminn mig senare</value>
|
||||
|
||||
@@ -2500,7 +2500,7 @@
|
||||
<value>在 {1} 上以 {0} 身份登录</value>
|
||||
</data>
|
||||
<data name="NotYou" xml:space="preserve">
|
||||
<value>不是您吗？</value>
|
||||
<value>不是你？</value>
|
||||
</data>
|
||||
<data name="LogInWithMasterPassword" xml:space="preserve">
|
||||
<value>使用主密码登录</value>
|
||||
|
||||
@@ -571,39 +571,28 @@ namespace Bit.Core.Services
|
||||
await UpsertAsync(data);
|
||||
}
|
||||
|
||||
public async Task ShareWithServerAsync(CipherView cipherView, string organizationId, HashSet<string> collectionIds)
|
||||
public async Task ShareWithServerAsync(CipherView cipher, string organizationId, HashSet<string> collectionIds)
|
||||
{
|
||||
var attachmentTasks = new List<Task>();
|
||||
Cipher cipher = null;
|
||||
//If the cipher doesn't have a key, we update it
|
||||
if(cipherView.Key == null && await ShouldUseCipherKeyEncryptionAsync())
|
||||
if (cipher.Attachments != null)
|
||||
{
|
||||
await UpdateAndUpsertAsync(cipherView, cipher => _apiService.PutCipherAsync(cipherView.Id, new CipherRequest(cipher)));
|
||||
cipher = await GetAsync(cipherView.Id);
|
||||
cipherView = await cipher.DecryptAsync();
|
||||
}
|
||||
if (cipherView.Attachments != null)
|
||||
{
|
||||
foreach (var attachment in cipherView.Attachments)
|
||||
foreach (var attachment in cipher.Attachments)
|
||||
{
|
||||
if (attachment.Key == null)
|
||||
{
|
||||
attachmentTasks.Add(ShareAttachmentWithServerAsync(attachment, cipherView.Id, organizationId));
|
||||
attachmentTasks.Add(ShareAttachmentWithServerAsync(attachment, cipher.Id, organizationId));
|
||||
}
|
||||
}
|
||||
}
|
||||
await Task.WhenAll(attachmentTasks);
|
||||
cipherView.OrganizationId = organizationId;
|
||||
cipherView.CollectionIds = collectionIds;
|
||||
await UpdateAndUpsertAsync(cipherView, cipher => _apiService.PutShareCipherAsync(cipherView.Id, new CipherShareRequest(cipher)), collectionIds);
|
||||
|
||||
async Task UpdateAndUpsertAsync(CipherView cipherView, Func<Cipher,Task<CipherResponse>> callPutCipherApi, HashSet<string> collectionIds = null)
|
||||
{
|
||||
var cipher = await EncryptAsync(cipherView);
|
||||
var response = await callPutCipherApi(cipher);
|
||||
var data = new CipherData(response, await _stateService.GetActiveUserIdAsync(), collectionIds);
|
||||
await UpsertAsync(data);
|
||||
}
|
||||
cipher.OrganizationId = organizationId;
|
||||
cipher.CollectionIds = collectionIds;
|
||||
var encCipher = await EncryptAsync(cipher);
|
||||
var request = new CipherShareRequest(encCipher);
|
||||
var response = await _apiService.PutShareCipherAsync(cipher.Id, request);
|
||||
var userId = await _stateService.GetActiveUserIdAsync();
|
||||
var data = new CipherData(response, userId, collectionIds);
|
||||
await UpsertAsync(data);
|
||||
}
|
||||
|
||||
public async Task<Cipher> SaveAttachmentRawWithServerAsync(Cipher cipher, CipherView cipherView, string filename, byte[] data)
|
||||
|
||||
@@ -152,17 +152,17 @@ namespace Bit.iOS.Autofill
|
||||
}
|
||||
}
|
||||
|
||||
public override async void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
|
||||
{
|
||||
try
|
||||
{
|
||||
await ProvideCredentialWithoutUserInteractionAsync(credentialIdentity);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
OnProvidingCredentialException(ex);
|
||||
}
|
||||
}
|
||||
//public override async void ProvideCredentialWithoutUserInteraction(ASPasswordCredentialIdentity credentialIdentity)
|
||||
//{
|
||||
// try
|
||||
// {
|
||||
// await ProvideCredentialWithoutUserInteractionAsync(credentialIdentity);
|
||||
// }
|
||||
// catch (Exception ex)
|
||||
// {
|
||||
// OnProvidingCredentialException(ex);
|
||||
// }
|
||||
//}
|
||||
|
||||
[Export("prepareInterfaceToProvideCredentialForRequest:")]
|
||||
public override async void PrepareInterfaceToProvideCredential(IASCredentialRequest credentialRequest)
|
||||
@@ -197,17 +197,17 @@ namespace Bit.iOS.Autofill
|
||||
}
|
||||
}
|
||||
|
||||
public override async void PrepareInterfaceToProvideCredential(ASPasswordCredentialIdentity credentialIdentity)
|
||||
{
|
||||
try
|
||||
{
|
||||
await PrepareInterfaceToProvideCredentialAsync(c => c.PasswordCredentialIdentity = credentialIdentity);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
OnProvidingCredentialException(ex);
|
||||
}
|
||||
}
|
||||
//public override async void PrepareInterfaceToProvideCredential(ASPasswordCredentialIdentity credentialIdentity)
|
||||
//{
|
||||
// try
|
||||
// {
|
||||
// await PrepareInterfaceToProvideCredentialAsync(c => c.PasswordCredentialIdentity = credentialIdentity);
|
||||
// }
|
||||
// catch (Exception ex)
|
||||
// {
|
||||
// OnProvidingCredentialException(ex);
|
||||
// }
|
||||
//}
|
||||
|
||||
public override async void PrepareInterfaceForExtensionConfiguration()
|
||||
{
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.8bit.bitwarden.autofill</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>2024.6.0</string>
|
||||
<string>2024.5.2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>CFBundleLocalizations</key>
|
||||
|
||||
@@ -15,6 +15,9 @@ using Foundation;
|
||||
using Microsoft.Maui.Controls.Compatibility;
|
||||
using UIKit;
|
||||
using Microsoft.Maui.Platform;
|
||||
using CollectionView = Bit.Core.Models.View.CollectionView;
|
||||
using Bit.Core.Models.Domain;
|
||||
using Bit.Core.Enums;
|
||||
|
||||
namespace Bit.iOS.Core.Controllers
|
||||
{
|
||||
@@ -23,7 +26,19 @@ namespace Bit.iOS.Core.Controllers
|
||||
private ICipherService _cipherService;
|
||||
private IFolderService _folderService;
|
||||
private IStorageService _storageService;
|
||||
private IOrganizationService _organizationService;
|
||||
private ICollectionService _collectionService;
|
||||
private IPolicyService _policyService;
|
||||
private IEnumerable<FolderView> _folders;
|
||||
private IEnumerable<CollectionView> _collections;
|
||||
private IEnumerable<CollectionView> _writeableCollections;
|
||||
private IEnumerable<Organization> _organizations;
|
||||
|
||||
private bool _personalOwnershipPolicyApplies;
|
||||
//Here we have the different sizes dependent of the _personalOwnershipPolicyApplies
|
||||
private readonly int[] _personalVault = { 3, 1, 2, 1 };
|
||||
private readonly int[] _groupVault = { 1, 3, 1, 2, 1, 2 };
|
||||
private ExtendedUITableViewCell[][] _tableViewCell;
|
||||
|
||||
protected LoginAddViewController(IntPtr handle)
|
||||
: base(handle)
|
||||
@@ -38,6 +53,10 @@ namespace Bit.iOS.Core.Controllers
|
||||
public FormEntryTableViewCell NotesCell { get; set; } = new FormEntryTableViewCell(
|
||||
useTextView: true, height: 180);
|
||||
public PickerTableViewCell FolderCell { get; set; } = new PickerTableViewCell(AppResources.Folder);
|
||||
public PickerTableViewCell OrganizationCell { get; set; } = new PickerTableViewCell(AppResources.Organization);
|
||||
public PickerTableViewCell CollectionCell { get; set; } = new PickerTableViewCell(AppResources.Collections);
|
||||
|
||||
public FormEntryTableViewCell PersonalOwnershipPolicyCell { get; set; } = new FormEntryTableViewCell(empty: true);
|
||||
|
||||
public abstract UINavigationItem BaseNavItem { get; }
|
||||
public abstract UIBarButtonItem BaseCancelButton { get; }
|
||||
@@ -51,6 +70,9 @@ namespace Bit.iOS.Core.Controllers
|
||||
_cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
|
||||
_folderService = ServiceContainer.Resolve<IFolderService>("folderService");
|
||||
_storageService = ServiceContainer.Resolve<IStorageService>("storageService");
|
||||
_organizationService = ServiceContainer.Resolve<IOrganizationService>("organizationService");
|
||||
_collectionService = ServiceContainer.Resolve<ICollectionService>("collectionService");
|
||||
_policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
|
||||
|
||||
BaseNavItem.Title = AppResources.AddItem;
|
||||
BaseCancelButton.Title = AppResources.Cancel;
|
||||
@@ -113,6 +135,42 @@ namespace Bit.iOS.Core.Controllers
|
||||
folderNames.Insert(0, AppResources.FolderNone);
|
||||
FolderCell.Items = folderNames;
|
||||
|
||||
_personalOwnershipPolicyApplies = _policyService.PolicyAppliesToUser(PolicyType.PersonalOwnership).GetAwaiter().GetResult();
|
||||
var index = 0;
|
||||
if (_personalOwnershipPolicyApplies)
|
||||
{
|
||||
|
||||
_organizations = _organizationService.GetAllAsync().GetAwaiter().GetResult().OrderBy(o => o.Name).ToList();
|
||||
|
||||
OrganizationCell.Items = _organizations.Select(o => o.Name).ToList();
|
||||
OrganizationCell.ValueChanged += Type_ValueChanged;
|
||||
|
||||
_collections = _collectionService.GetAllDecryptedAsync().GetAwaiter().GetResult();
|
||||
_writeableCollections = _collections.Where(c => !c.ReadOnly).OrderBy(c => c.Name).ToList();
|
||||
var collectionsNames = _writeableCollections.Where(c => c.OrganizationId == _organizations.ElementAt(OrganizationCell.SelectedIndex).Id).Select(s => s.Name).ToList();
|
||||
if (collectionsNames.Count == 0)
|
||||
{
|
||||
collectionsNames.Insert(0, AppResources.NoCollectionsToList);
|
||||
}
|
||||
|
||||
CollectionCell.Items = collectionsNames;
|
||||
|
||||
_tableViewCell = new ExtendedUITableViewCell[_groupVault.Length][];
|
||||
_tableViewCell[0] = new ExtendedUITableViewCell[] { PersonalOwnershipPolicyCell };
|
||||
_tableViewCell[5] = new ExtendedUITableViewCell[] { OrganizationCell, CollectionCell };
|
||||
|
||||
index = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
_tableViewCell = new ExtendedUITableViewCell[_personalVault.Length][];
|
||||
}
|
||||
|
||||
_tableViewCell[index] = new ExtendedUITableViewCell[] { NameCell, UsernameCell, PasswordCell };
|
||||
_tableViewCell[++index] = new ExtendedUITableViewCell[] { UriCell };
|
||||
_tableViewCell[++index] = new ExtendedUITableViewCell[] { FolderCell, FavoriteCell };
|
||||
_tableViewCell[++index] = new ExtendedUITableViewCell[] { NotesCell };
|
||||
|
||||
TableView.RowHeight = UITableView.AutomaticDimension;
|
||||
TableView.EstimatedRowHeight = 70;
|
||||
TableView.Source = new TableSource(this);
|
||||
@@ -121,6 +179,19 @@ namespace Bit.iOS.Core.Controllers
|
||||
base.ViewDidLoad();
|
||||
}
|
||||
|
||||
private void Type_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
var organizationList = _organizations.OrderBy(o => o.Name).ToList();
|
||||
var collectionsNames = _writeableCollections.Where(c => c.OrganizationId == _organizations.ElementAt(OrganizationCell.SelectedIndex).Id).Select(s => s.Name).ToList();
|
||||
if (collectionsNames.Count == 0)
|
||||
{
|
||||
collectionsNames.Insert(0, AppResources.NoCollectionsToList);
|
||||
}
|
||||
|
||||
CollectionCell.Items = collectionsNames;
|
||||
_tableViewCell[5][1].ReloadInputViews();
|
||||
}
|
||||
|
||||
public override void ViewDidAppear(bool animated)
|
||||
{
|
||||
base.ViewDidAppear(animated);
|
||||
@@ -167,7 +238,10 @@ namespace Bit.iOS.Core.Controllers
|
||||
null : UsernameCell.TextField.Text,
|
||||
Password = string.IsNullOrWhiteSpace(PasswordCell.TextField.Text) ?
|
||||
null : PasswordCell.TextField.Text,
|
||||
}
|
||||
},
|
||||
CollectionIds = CollectionCell.SelectedItem.ToString() == AppResources.NoCollectionsToList ?
|
||||
null : new HashSet<string> { _collections.ElementAtOrDefault(CollectionCell.SelectedIndex)?.Id },
|
||||
OrganizationId = OrganizationCell.SelectedItem != null ? _organizations.ElementAtOrDefault(CollectionCell.SelectedIndex)?.Id : null,
|
||||
};
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(UriCell?.TextField?.Text))
|
||||
@@ -272,42 +346,7 @@ namespace Bit.iOS.Core.Controllers
|
||||
|
||||
public override UITableViewCell GetCell(UITableView tableView, NSIndexPath indexPath)
|
||||
{
|
||||
if (indexPath.Section == 0)
|
||||
{
|
||||
if (indexPath.Row == 0)
|
||||
{
|
||||
return _controller.NameCell;
|
||||
}
|
||||
else if (indexPath.Row == 1)
|
||||
{
|
||||
return _controller.UsernameCell;
|
||||
}
|
||||
else if (indexPath.Row == 2)
|
||||
{
|
||||
return _controller.PasswordCell;
|
||||
}
|
||||
}
|
||||
else if (indexPath.Section == 1)
|
||||
{
|
||||
return _controller.UriCell;
|
||||
}
|
||||
else if (indexPath.Section == 2)
|
||||
{
|
||||
if (indexPath.Row == 0)
|
||||
{
|
||||
return _controller.FolderCell;
|
||||
}
|
||||
else if (indexPath.Row == 1)
|
||||
{
|
||||
return _controller.FavoriteCell;
|
||||
}
|
||||
}
|
||||
else if (indexPath.Section == 3)
|
||||
{
|
||||
return _controller.NotesCell;
|
||||
}
|
||||
|
||||
return new ExtendedUITableViewCell();
|
||||
return _controller._tableViewCell[indexPath.Section][indexPath.Row];
|
||||
}
|
||||
|
||||
public override nfloat GetHeightForRow(UITableView tableView, NSIndexPath indexPath)
|
||||
@@ -317,43 +356,71 @@ namespace Bit.iOS.Core.Controllers
|
||||
|
||||
public override nint NumberOfSections(UITableView tableView)
|
||||
{
|
||||
return 4;
|
||||
if (_controller._personalOwnershipPolicyApplies)
|
||||
{
|
||||
return _controller._groupVault.Length;
|
||||
}
|
||||
else
|
||||
{
|
||||
return _controller._personalVault.Length;
|
||||
}
|
||||
}
|
||||
|
||||
public override nint RowsInSection(UITableView tableview, nint section)
|
||||
{
|
||||
if (section == 0)
|
||||
if (_controller._personalOwnershipPolicyApplies)
|
||||
{
|
||||
return 3;
|
||||
}
|
||||
else if (section == 1)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
else if (section == 2)
|
||||
{
|
||||
return 2;
|
||||
return _controller._groupVault[section];
|
||||
}
|
||||
else
|
||||
{
|
||||
return 1;
|
||||
return _controller._personalVault[section];
|
||||
}
|
||||
}
|
||||
|
||||
public override nfloat GetHeightForHeader(UITableView tableView, nint section)
|
||||
{
|
||||
return section == 0 || section == 3 ? UITableView.AutomaticDimension : 0.00001f;
|
||||
if (_controller._personalOwnershipPolicyApplies)
|
||||
{
|
||||
return section == 0 || section == 1 || section == 4 || section == 5 ? UITableView.AutomaticDimension : 0.00001f;
|
||||
}
|
||||
else
|
||||
{
|
||||
return section == 0 || section == 3 ? UITableView.AutomaticDimension : 0.00001f;
|
||||
}
|
||||
}
|
||||
|
||||
public override string TitleForHeader(UITableView tableView, nint section)
|
||||
{
|
||||
if (section == 0)
|
||||
if (_controller._personalOwnershipPolicyApplies)
|
||||
{
|
||||
return AppResources.ItemInformation;
|
||||
if (section == 0)
|
||||
{
|
||||
return AppResources.PersonalOwnershipPolicyInEffect;
|
||||
}
|
||||
if (section == 1)
|
||||
{
|
||||
return AppResources.ItemInformation;
|
||||
}
|
||||
else if (section == 4)
|
||||
{
|
||||
return AppResources.Notes;
|
||||
}
|
||||
else if (section == 5)
|
||||
{
|
||||
return AppResources.WhoOwnsThisItem;
|
||||
}
|
||||
}
|
||||
else if (section == 3)
|
||||
else
|
||||
{
|
||||
return AppResources.Notes;
|
||||
if (section == 0)
|
||||
{
|
||||
return AppResources.ItemInformation;
|
||||
}
|
||||
else if (section == 3)
|
||||
{
|
||||
return AppResources.Notes;
|
||||
}
|
||||
}
|
||||
|
||||
return string.Empty;
|
||||
|
||||
@@ -22,7 +22,8 @@ namespace Bit.iOS.Core.Views
|
||||
nfloat? height = null,
|
||||
ButtonsConfig buttonsConfig = ButtonsConfig.None,
|
||||
bool useLabelAsPlaceholder = false,
|
||||
float leadingConstant = 15f)
|
||||
float leadingConstant = 15f,
|
||||
bool empty = false)
|
||||
: base(UITableViewCellStyle.Default, nameof(FormEntryTableViewCell))
|
||||
{
|
||||
var descriptor = UIFontDescriptor.PreferredBody;
|
||||
@@ -86,7 +87,7 @@ namespace Bit.iOS.Core.Views
|
||||
ValueChanged?.Invoke(sender, e);
|
||||
};
|
||||
}
|
||||
else
|
||||
else if( !empty )
|
||||
{
|
||||
TextField = new UITextField
|
||||
{
|
||||
@@ -128,18 +129,18 @@ namespace Bit.iOS.Core.Views
|
||||
NSLayoutConstraint.Create(TextField, NSLayoutAttribute.Top, NSLayoutRelation.Equal, ContentView, NSLayoutAttribute.Top, 1f, 10f));
|
||||
}
|
||||
|
||||
if (height.HasValue)
|
||||
{
|
||||
ContentView.AddConstraint(
|
||||
NSLayoutConstraint.Create(TextField, NSLayoutAttribute.Height, NSLayoutRelation.Equal, null, NSLayoutAttribute.NoAttribute, 1f, height.Value));
|
||||
}
|
||||
|
||||
TextField.AddTarget((object sender, EventArgs e) =>
|
||||
{
|
||||
ValueChanged?.Invoke(sender, e);
|
||||
}, UIControlEvent.EditingChanged);
|
||||
}
|
||||
|
||||
if (empty && height.HasValue)
|
||||
{
|
||||
ContentView.AddConstraint(
|
||||
NSLayoutConstraint.Create(TextField, NSLayoutAttribute.Height, NSLayoutRelation.Equal, null, NSLayoutAttribute.NoAttribute, 1f, height.Value));
|
||||
}
|
||||
|
||||
if (labelName != null && !useLabelAsPlaceholder)
|
||||
{
|
||||
ContentView.AddConstraints(new NSLayoutConstraint[] {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.8bit.bitwarden.find-login-action-extension</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>2024.6.0</string>
|
||||
<string>2024.5.2</string>
|
||||
<key>CFBundleLocalizations</key>
|
||||
<array>
|
||||
<string>en</string>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>2024.6.0</string>
|
||||
<string>2024.5.2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>MinimumOSVersion</key>
|
||||
|
||||
Reference in New Issue
Block a user