cleanup

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java

@@ -303,7 +303,6 @@ public class EncryptionTestIT extends AbstractIT {
         // encrypt
         EncryptedFolderMetadata encryptedFolderMetadata1 = encryptFolderMetadata(
             decryptedFolderMetadata1,
-            privateKey,
             cert,
             arbitraryDataProvider,
             user,
@@ -339,7 +338,6 @@ public class EncryptionTestIT extends AbstractIT {
         // encrypt
         EncryptedFolderMetadata encryptedFolderMetadata1 = encryptFolderMetadata(
             decryptedFolderMetadata1,
-            privateKey,
             cert,
             arbitraryDataProvider,
             user,
@@ -352,7 +350,6 @@ public class EncryptionTestIT extends AbstractIT {
         // encrypt
         EncryptedFolderMetadata encryptedFolderMetadata2 = encryptFolderMetadata(
             decryptedFolderMetadata1,
-            privateKey,
             cert,
             arbitraryDataProvider,
             user,
@@ -372,7 +369,6 @@ public class EncryptionTestIT extends AbstractIT {
         // encrypt
         EncryptedFolderMetadata encryptedFolderMetadata1 = encryptFolderMetadata(
             decryptedFolderMetadata1,
-            privateKey,
             cert,
             arbitraryDataProvider,
             user,
@@ -386,7 +382,6 @@ public class EncryptionTestIT extends AbstractIT {
         // encrypt
         EncryptedFolderMetadata encryptedFolderMetadata2 = encryptFolderMetadata(
             decryptedFolderMetadata1,
-            privateKey,
             cert,
             arbitraryDataProvider,
             user,
@@ -440,7 +435,6 @@ public class EncryptionTestIT extends AbstractIT {
         // encrypt
         EncryptedFolderMetadata encryptedFolderMetadata1 = encryptFolderMetadata(
             decryptedFolderMetadata1,
-            privateKey,
             cert,
             arbitraryDataProvider,
             user,
@@ -479,7 +473,6 @@ public class EncryptionTestIT extends AbstractIT {
 
             // encrypt
             encryptedFolderMetadata1 = encryptFolderMetadata(decryptedFolderMetadata1,
-                                                             privateKey,
                                                              cert,
                                                              arbitraryDataProvider,
                                                              user,
@@ -536,12 +529,11 @@ public class EncryptionTestIT extends AbstractIT {
         // encrypt
         EncryptedFolderMetadata encryptedFolderMetadata1 = encryptFolderMetadata(
             decryptedFolderMetadata1,
-            privateKey,
             cert,
             arbitraryDataProvider,
             user,
             folderID);
-        EncryptionUtils.encryptFileDropFiles(decryptedFolderMetadata1, encryptedFolderMetadata1, cert);
+        EncryptionUtils.encryptFileDropFiles(decryptedFolderMetadata1, encryptedFolderMetadata1);
 
         // serialize
         String encryptedJson = serializeJSON(encryptedFolderMetadata1);

app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java

@@ -152,7 +152,6 @@ public class CreateFolderOperation extends SyncOperation implements OnRemoteOper
                 metadata.getFiles().put(encryptedFileName, createDecryptedFile(filename));
 
                 EncryptedFolderMetadata encryptedFolderMetadata = EncryptionUtils.encryptFolderMetadata(metadata,
-                                                                                                        privateKey,
                                                                                                         publicKey,
                                                                                                         arbitraryDataProvider,
                                                                                                         user,

app/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.java

@@ -148,7 +148,6 @@ public class RemoveRemoteEncryptedFileOperation extends RemoteOperation {
 
             EncryptedFolderMetadata encryptedFolderMetadata = EncryptionUtils.encryptFolderMetadata(
                 metadata,
-                privateKey,
                 publicKey,
                 arbitraryDataProvider,
                 user,

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -619,7 +619,6 @@ public class UploadFileOperation extends SyncOperation {
                 metadata.getFiles().put(encryptedFileName, decryptedFile);
 
                 EncryptedFolderMetadata encryptedFolderMetadata = EncryptionUtils.encryptFolderMetadata(metadata,
-                                                                                                        privateKey,
                                                                                                         publicKey,
                                                                                                         arbitraryDataProvider,
                                                                                                         user,

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1757,7 +1757,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
                 DecryptedFolderMetadata metadata = metadataPair.second;
 
                 EncryptedFolderMetadata encryptedFolderMetadata = EncryptionUtils.encryptFolderMetadata(metadata,
-                                                                                                        privateKey,
                                                                                                         publicKey,
                                                                                                         arbitraryDataProvider,
                                                                                                         user,

app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java

@@ -106,7 +106,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
  * Utils for encryption
  */
 public final class EncryptionUtils {
-    private static String TAG = EncryptionUtils.class.getSimpleName();
+    private static final String TAG = EncryptionUtils.class.getSimpleName();
 
     public static final String PUBLIC_KEY = "PUBLIC_KEY";
     public static final String PRIVATE_KEY = "PRIVATE_KEY";
@@ -169,7 +169,6 @@ public final class EncryptionUtils {
      * @return EncryptedFolderMetadata encrypted folder metadata
      */
     public static EncryptedFolderMetadata encryptFolderMetadata(DecryptedFolderMetadata decryptedFolderMetadata,
-                                                                String privateKey,
                                                                 String publicKey,
                                                                 ArbitraryDataProvider arbitraryDataProvider,
                                                                 User user,
@@ -222,14 +221,14 @@ public final class EncryptionUtils {
     }
 
     @VisibleForTesting
-    public static void encryptFileDropFiles(DecryptedFolderMetadata decryptedFolderMetadata, EncryptedFolderMetadata encryptedFolderMetadata, String cert) throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException, CertificateException {
+    public static void encryptFileDropFiles(DecryptedFolderMetadata decryptedFolderMetadata,
+                                            EncryptedFolderMetadata encryptedFolderMetadata) {
         final Map<String, EncryptedFiledrop> filesdrop = encryptedFolderMetadata.getFiledrop();
         for (Map.Entry<String, DecryptedFolderMetadata.DecryptedFile> entry : decryptedFolderMetadata
             .getFiledrop().entrySet()) {
             String key = entry.getKey();
             DecryptedFolderMetadata.DecryptedFile decryptedFile = entry.getValue();
 
-            // TODO
             String dataJson = EncryptionUtils.serializeJSON(decryptedFile.getEncrypted());
             EncryptedFiledrop encryptedFile = new EncryptedFiledrop(dataJson,
                                                                     decryptedFile.getInitializationVector(),
@@ -237,12 +236,6 @@ public final class EncryptionUtils {
                                                                     "123",
                                                                     "123",
                                                                     "123");
-//            encryptedFile.setInitializationVector(decryptedFile.getInitializationVector());
-//            encryptedFile.setAuthenticationTag(decryptedFile.getAuthenticationTag());
-
-            // encrypt
-
-//            encryptedFile.setEncrypted(EncryptionUtils.encryptStringAsymmetric(dataJson, cert));
 
             filesdrop.put(key, encryptedFile);
         }
@@ -401,7 +394,6 @@ public final class EncryptionUtils {
 
                 // upload metadata
                 EncryptedFolderMetadata encryptedFolderMetadataNew = encryptFolderMetadata(decryptedFolderMetadata,
-                                                                                           privateKey,
                                                                                            publicKey,
                                                                                            arbitraryDataProvider,
                                                                                            user,
@@ -1007,7 +999,9 @@ public final class EncryptionUtils {
         throws UploadException,
         InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchPaddingException, BadPaddingException,
         IllegalBlockSizeException, InvalidKeyException, InvalidKeySpecException, CertificateException {
-        GetMetadataRemoteOperation getMetadataOperation = new GetMetadataRemoteOperation(parentFile.getLocalId());
+        long localId = parentFile.getLocalId();
+
+        GetMetadataRemoteOperation getMetadataOperation = new GetMetadataRemoteOperation(localId);
         RemoteOperationResult getMetadataOperationResult = getMetadataOperation.execute(client);
 
         DecryptedFolderMetadata metadata;
@@ -1021,11 +1015,11 @@ public final class EncryptionUtils {
                 serializedEncryptedMetadata, new TypeToken<EncryptedFolderMetadata>() {
                 });
 
-            return new Pair<>(Boolean.TRUE, EncryptionUtils.decryptFolderMetaData(encryptedFolderMetadata,
-                                                                                  privateKey,
-                                                                                  arbitraryDataProvider,
-                                                                                  user,
-                                                                                  parentFile.getLocalId()));
+            return new Pair<>(Boolean.TRUE, decryptFolderMetaData(encryptedFolderMetadata,
+                                                                  privateKey,
+                                                                  arbitraryDataProvider,
+                                                                  user,
+                                                                  localId));
 
         } else if (getMetadataOperationResult.getHttpCode() == HttpStatus.SC_NOT_FOUND) {
             // new metadata