refactor(get-public-key): rename to get certificate

app/src/androidTest/java/com/owncloud/android/operations/DeleteE2ERemoteOperationIT.kt

@@ -12,7 +12,7 @@ import com.owncloud.android.lib.resources.e2ee.DeleteEncryptedFilesRemoteOperati
 import com.owncloud.android.lib.resources.users.DeletePrivateKeyRemoteOperation
 import com.owncloud.android.lib.resources.users.DeletePublicKeyRemoteOperation
 import com.owncloud.android.lib.resources.users.GetPrivateKeyRemoteOperation
-import com.owncloud.android.lib.resources.users.GetPublicKeyRemoteOperation
+import com.owncloud.android.lib.resources.users.GetCertificateRemoteOperation
 import com.owncloud.android.lib.resources.users.StorePrivateKeyRemoteOperation
 import com.owncloud.android.ui.dialog.setupEncryption.EncryptionKeyGenerator
 import com.owncloud.android.utils.EncryptionUtils
@@ -58,7 +58,7 @@ class DeleteE2ERemoteOperationIT : AbstractOnServerIT() {
         val result = sut.execute(nextcloudClient)
         assertTrue(result.isSuccess)
 
-        val getResult = GetPublicKeyRemoteOperation().execute(nextcloudClient)
+        val getResult = GetCertificateRemoteOperation().execute(nextcloudClient)
         assertFalse(getResult.isSuccess)
     }
 }

app/src/main/java/com/nextcloud/utils/e2ee/E2EEKeyInspector.kt

@@ -19,7 +19,7 @@ import com.owncloud.android.lib.common.OwnCloudClientFactory
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.e2ee.GetMetadataRemoteOperation
 import com.owncloud.android.lib.resources.status.OCCapability
-import com.owncloud.android.lib.resources.users.GetPublicKeyRemoteOperation
+import com.owncloud.android.lib.resources.users.GetCertificateRemoteOperation
 import com.owncloud.android.lib.resources.users.GetServerPublicKeyRemoteOperation
 import com.owncloud.android.operations.GetCapabilitiesOperation
 import com.owncloud.android.ui.dialog.setupEncryption.CertificateValidator
@@ -62,7 +62,7 @@ class E2EEKeyInspector @Inject constructor(
 
         val user = accountManager.user
 
-        val certificateResult = GetPublicKeyRemoteOperation().executeNextcloudClient(user, context)
+        val certificateResult = GetCertificateRemoteOperation().executeNextcloudClient(user, context)
         if (!certificateResult.isSuccess) {
             return@withContext if (certificateResult.httpCode == HttpStatus.SC_NOT_FOUND) {
                 DownloadKeyResult.NoServerKey

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

@@ -31,7 +31,7 @@
 import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.lib.resources.users.GetPublicKeyRemoteOperation;
+import com.owncloud.android.lib.resources.users.GetCertificateRemoteOperation;
 import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.utils.EncryptionUtils;
 import com.owncloud.android.utils.EncryptionUtilsV2;
@@ -130,7 +130,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
 
                 if (publicKey.isEmpty()) {
                     NextcloudClient nextcloudClient = new ClientFactoryImpl(context).createNextcloudClient(user);
-                    RemoteOperationResult<String> result = new GetPublicKeyRemoteOperation(shareeName).execute(nextcloudClient);
+                    RemoteOperationResult<String> result = new GetCertificateRemoteOperation(shareeName).execute(nextcloudClient);
                     if (result.isSuccess()) {
                         // store it
                         EncryptionUtils.savePublicKey(

app/src/main/java/com/owncloud/android/ui/dialog/setupEncryption/SetupEncryptionDialogFragment.kt

@@ -31,7 +31,7 @@ import com.owncloud.android.datamodel.ArbitraryDataProvider
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.users.GetPrivateKeyRemoteOperation
-import com.owncloud.android.lib.resources.users.GetPublicKeyRemoteOperation
+import com.owncloud.android.lib.resources.users.GetCertificateRemoteOperation
 import com.owncloud.android.lib.resources.users.GetServerPublicKeyRemoteOperation
 import com.owncloud.android.ui.dialog.extensions.themeButtons
 import com.owncloud.android.ui.dialog.setupEncryption.model.DownloadKeyResult
@@ -267,8 +267,7 @@ class SetupEncryptionDialogFragment :
             val user = user ?: return@withContext DownloadKeyResult.UnexpectedError()
             val dataProvider = arbitraryDataProvider ?: return@withContext DownloadKeyResult.UnexpectedError()
 
-            // GetPublicKeyRemoteOperation is wrong naming it actually fetches certificate
-            val certificateOperation = GetPublicKeyRemoteOperation()
+            val certificateOperation = GetCertificateRemoteOperation()
             val certificateResult = certificateOperation.executeNextcloudClient(user, weakContext)
             if (!certificateResult.isSuccess) {
                 // The certificate might not be available on the server yet.

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

@@ -115,7 +115,6 @@ public final class EncryptionUtils {
     private static final String TAG = EncryptionUtils.class.getSimpleName();
 
     // PUBLIC_KEY actually represents certificate this confusion caused by
-    // backend APIs: GetPublicKeyRemoteOperation() -> returns certificate not public key
     // later PUBLIC_KEY must rename to CERTIFICATE
     public static final String PUBLIC_KEY = "PUBLIC_KEY";
 

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.34.0"
 androidGifDrawableVersion = "1.2.32"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="341433fc18b46f7e30a92676741aa44ec987c1f4"
+androidLibraryVersion ="c5d456af26"
 androidOpensslVersion = "3.5.6.1"
 androidPluginVersion = "9.4.1"
 androidsvgVersion = "1.4"

gradle/verification-metadata.xml

@@ -23427,6 +23427,14 @@
             <sha256 value="0ad7d7af0639c42ea1e521c248e650e26cc0fc21441308574bc4a6e5d9234bf1" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="c5d456af26">
+         <artifact name="android-library-c5d456af26.aar">
+            <sha256 value="58bdb1cc488a5532ab60838154f0cba93d75f45f36377b7098afef98b19db61c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-c5d456af26.module">
+            <sha256 value="5a38cd42335aefadb8faca41a466ce17d68ad008decd7978f38b363dc3cd477f" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="c6eac2850079c82b80a8b2a71d9a2cf353f118a5">
          <artifact name="android-library-c6eac2850079c82b80a8b2a71d9a2cf353f118a5.aar">
             <sha256 value="22c05e04d2b2667c39da419b2d3d07e7832babd4b2e235aa5d4394a4fecf92ee" origin="Generated by Gradle" reason="Artifact is not signed"/>