Fix rebase problems with credential sharing

app/models/encryptable.rb

@@ -31,17 +31,20 @@ class Encryptable < ApplicationRecord
   def encrypt(team_password, encryption_algorithm = nil)
     return if file? && cleartext_file.empty?
 
-    used_encrypted_attrs.each do |attribute|
-      encrypt_attr(attribute, team_password, encryption_algorithm)
-    end
+    attributes = transferred? ? available_attrs : used_encrypted_attrs
+    attributes.each { |attribute| encrypt_attr(attribute, team_password, encryption_algorithm) }
   end
 
   def decrypt(team_password)
-    used_encrypted_attrs.each do |attribute|
+    available_attrs.each do |attribute|
       decrypt_attr(attribute, team_password)
     end
   end
 
+  def available_attrs
+    used_encrypted_attrs.select { |attribute| encrypted_data[attribute]&.dig(:data) }
+  end
+
   def recrypt(team_password, new_team_password, new_encryption_class)
     decrypt(team_password)
 

app/models/encryptable/file.rb

@@ -13,10 +13,6 @@ class Encryptable::File < Encryptable
 
   validate :file_size, on: [:create, :update]
 
-  def decrypt_transferred(private_key)
-    decrypt(plaintext_transfer_password(private_key))
-  end
-
   def team
     folder&.team || encryptable_credential.folder.team
   end

app/utils/encryptable_transfer.rb

@@ -2,8 +2,11 @@
 
 class EncryptableTransfer
 
+  # rubocop:disable Metrics/MethodLength
   def transfer(encryptable, receiver, sender)
-    transfer_password = transfer_password(receiver)
+    encryption_algorithm = receiver_encryption_algorithm(receiver)
+
+    transfer_password = encryption_algorithm.random_key
     encryptable.encrypt(transfer_password, encryption_algorithm)
 
     encryptable.name = encryptable_destination_name(encryptable, receiver)
@@ -16,6 +19,7 @@ def transfer(encryptable, receiver, sender)
     )
     encryptable
   end
+  # rubocop:enable Metrics/MethodLength
 
   def receive(encryptable, private_key, personal_team_password)
     encryptable.decrypt_transferred(private_key)
@@ -45,10 +49,9 @@ def encrypted_transfer_password(password, receiver)
     )
   end
 
-  def transfer_password(receiver)
+  def receiver_encryption_algorithm(receiver)
     encryption_algorithm = receiver.personal_team.encryption_algorithm
-    encryption_algorithm = Crypto::Symmetric::ALGORITHMS[encryption_algorithm]
-    encryption_algorithm.random_key
+    Crypto::Symmetric::ALGORITHMS[encryption_algorithm]
   end
 
   def transfered_name(name, existing_names, is_file)