use nextcloud user agent for E2e calls

build.gradle

@@ -194,7 +194,8 @@ android {
 dependencies {
     /// dependencies for app building
     implementation 'com.android.support:multidex:1.0.2'
-    implementation 'com.github.nextcloud:android-library:1.0.34'
+//    implementation 'com.github.nextcloud:android-library:1.0.34'
+    implementation project('nextcloud-android-library')
     versionDevImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT' // use always latest master
     implementation "com.android.support:support-v4:${supportLibraryVersion}"
     implementation "com.android.support:design:${supportLibraryVersion}"

src/main/java/com/owncloud/android/MainApp.java

@@ -35,6 +35,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.StrictMode;
+import android.support.annotation.StringRes;
 import android.support.multidex.MultiDexApplication;
 import android.support.v4.util.Pair;
 import android.support.v7.app.AlertDialog;
@@ -118,6 +119,7 @@ public class MainApp extends MultiDexApplication {
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
 
         OwnCloudClientManagerFactory.setUserAgent(getUserAgent());
+        OwnCloudClientManagerFactory.setNextcloudUserAgent(getNextcloudUserAgent());
         if (isSamlAuth) {
             OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
         } else {
@@ -370,9 +372,19 @@ public class MainApp extends MultiDexApplication {
         return mOnlyOnDevice;
     }
 
-    // user agent
     public static String getUserAgent() {
-        String appString = getAppContext().getResources().getString(R.string.user_agent);
+        // Mozilla/5.0 (Android) ownCloud-android/1.7.0
+        return getUserAgent(R.string.user_agent);
+    }
+
+    public static String getNextcloudUserAgent() {
+        // Mozilla/5.0 (Android) Nextcloud-android/2.1.0
+        return getUserAgent(R.string.nextcloud_user_agent);
+    }
+
+    // user agent
+    private static String getUserAgent(@StringRes int agent) {
+        String appString = getAppContext().getResources().getString(agent);
         String packageName = getAppContext().getPackageName();
         String version = "";
 
@@ -386,10 +398,7 @@ public class MainApp extends MultiDexApplication {
             Log_OC.e(TAG, "Trying to get packageName", e.getCause());
         }
 
-        // Mozilla/5.0 (Android) ownCloud-android/1.7.0
-        String userAgent = String.format(appString, version);
-
-        return userAgent;
+        return String.format(appString, version);
     }
 
     private static void updateToAutoUpload() {

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

@@ -94,7 +94,7 @@ public class RemoveRemoteEncryptedFileOperation extends RemoteOperation {
         try {
             // Lock folder
             LockFileOperation lockFileOperation = new LockFileOperation(parentId);
-            RemoteOperationResult lockFileOperationResult = lockFileOperation.execute(client);
+            RemoteOperationResult lockFileOperationResult = lockFileOperation.execute(client, true);
 
             if (lockFileOperationResult.isSuccess()) {
                 token = (String) lockFileOperationResult.getData().get(0);
@@ -106,7 +106,7 @@ public class RemoveRemoteEncryptedFileOperation extends RemoteOperation {
 
             // refresh metadata
             GetMetadataOperation getMetadataOperation = new GetMetadataOperation(parentId);
-            RemoteOperationResult getMetadataOperationResult = getMetadataOperation.execute(client);
+            RemoteOperationResult getMetadataOperationResult = getMetadataOperation.execute(client, true);
 
             if (getMetadataOperationResult.isSuccess()) {
                 // decrypt metadata
@@ -139,7 +139,7 @@ public class RemoveRemoteEncryptedFileOperation extends RemoteOperation {
             // upload metadata
             UpdateMetadataOperation storeMetadataOperation = new UpdateMetadataOperation(parentId,
                     serializedFolderMetadata, token);
-            RemoteOperationResult uploadMetadataOperationResult = storeMetadataOperation.execute(client);
+            RemoteOperationResult uploadMetadataOperationResult = storeMetadataOperation.execute(client, true);
 
             if (!uploadMetadataOperationResult.isSuccess()) {
                 throw new RemoteOperationFailedException("Metadata not uploaded!");
@@ -159,7 +159,7 @@ public class RemoveRemoteEncryptedFileOperation extends RemoteOperation {
             // unlock file
             if (token != null) {
                 UnlockFileOperation unlockFileOperation = new UnlockFileOperation(parentId, token);
-                RemoteOperationResult unlockFileOperationResult = unlockFileOperation.execute(client);
+                RemoteOperationResult unlockFileOperationResult = unlockFileOperation.execute(client, true);
 
                 if (!unlockFileOperationResult.isSuccess()) {
                     Log_OC.e(TAG, "Failed to unlock " + parentId);

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

@@ -378,7 +378,7 @@ public class UploadFileOperation extends SyncOperation {
         // try to unlock folder with stored token, e.g. when upload needs to be resumed or app crashed
         if (parent.isEncrypted() && !mFolderUnlockToken.isEmpty()) {
             UnlockFileOperation unlockFileOperation = new UnlockFileOperation(parent.getLocalId(), mFolderUnlockToken);
-            RemoteOperationResult unlockFileOperationResult = unlockFileOperation.execute(client);
+            RemoteOperationResult unlockFileOperationResult = unlockFileOperation.execute(client, true);
 
             if (!unlockFileOperationResult.isSuccess()) {
                 return unlockFileOperationResult;
@@ -431,7 +431,7 @@ public class UploadFileOperation extends SyncOperation {
 
             // Lock folder
             LockFileOperation lockFileOperation = new LockFileOperation(parentFile.getLocalId());
-            RemoteOperationResult lockFileOperationResult = lockFileOperation.execute(client);
+            RemoteOperationResult lockFileOperationResult = lockFileOperation.execute(client, true);
 
             if (lockFileOperationResult.isSuccess()) {
                 token = (String) lockFileOperationResult.getData().get(0);
@@ -446,7 +446,7 @@ public class UploadFileOperation extends SyncOperation {
 
             // Update metadata
             GetMetadataOperation getMetadataOperation = new GetMetadataOperation(parentFile.getLocalId());
-            RemoteOperationResult getMetadataOperationResult = getMetadataOperation.execute(client);
+            RemoteOperationResult getMetadataOperationResult = getMetadataOperation.execute(client, true);
 
             DecryptedFolderMetadata metadata;
 
@@ -680,12 +680,12 @@ public class UploadFileOperation extends SyncOperation {
                     // update metadata
                     UpdateMetadataOperation storeMetadataOperation = new UpdateMetadataOperation(parentFile.getLocalId(),
                             serializedFolderMetadata, token);
-                    uploadMetadataOperationResult = storeMetadataOperation.execute(client);
+                    uploadMetadataOperationResult = storeMetadataOperation.execute(client, true);
                 } else {
                     // store metadata
                     StoreMetadataOperation storeMetadataOperation = new StoreMetadataOperation(parentFile.getLocalId(),
                             serializedFolderMetadata);
-                    uploadMetadataOperationResult = storeMetadataOperation.execute(client);
+                    uploadMetadataOperationResult = storeMetadataOperation.execute(client, true);
                 }
 
                 if (!uploadMetadataOperationResult.isSuccess()) {
@@ -752,7 +752,7 @@ public class UploadFileOperation extends SyncOperation {
     private void unlockFolder(OCFile parentFolder, OwnCloudClient client, String token) {
         if (token != null) {
             UnlockFileOperation unlockFileOperation = new UnlockFileOperation(parentFolder.getLocalId(), token);
-            RemoteOperationResult unlockFileOperationResult = unlockFileOperation.execute(client);
+            RemoteOperationResult unlockFileOperationResult = unlockFileOperation.execute(client, true);
 
             if (!unlockFileOperationResult.isSuccess()) {
                 Log_OC.e(TAG, "Failed to unlock " + parentFolder.getLocalId());

src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java

@@ -272,7 +272,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
             //  - decrypt private key, store unencrypted private key in database
 
             GetPublicKeyOperation publicKeyOperation = new GetPublicKeyOperation();
-            RemoteOperationResult publicKeyResult = publicKeyOperation.execute(account, getContext());
+            RemoteOperationResult publicKeyResult = publicKeyOperation.execute(account, getContext(), true);
 
             if (publicKeyResult.isSuccess()) {
                 Log_OC.d(TAG, "public key successful downloaded for " + account.name);
@@ -285,7 +285,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
             }
 
             GetPrivateKeyOperation privateKeyOperation = new GetPrivateKeyOperation();
-            RemoteOperationResult privateKeyResult = privateKeyOperation.execute(account, getContext());
+            RemoteOperationResult privateKeyResult = privateKeyOperation.execute(account, getContext(), true);
 
             if (privateKeyResult.isSuccess()) {
                 Log_OC.d(TAG, "private key successful downloaded for " + account.name);
@@ -343,7 +343,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
                 String urlEncoded = CsrHelper.generateCsrPemEncodedString(keyPair, account.name);
 
                 SendCSROperation operation = new SendCSROperation(urlEncoded);
-                RemoteOperationResult result = operation.execute(account, getContext());
+                RemoteOperationResult result = operation.execute(account, getContext(), true);
 
                 if (result.isSuccess()) {
                     Log_OC.d(TAG, "public key success");
@@ -366,7 +366,8 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
 
                 // upload encryptedPrivateKey
                 StorePrivateKeyOperation storePrivateKeyOperation = new StorePrivateKeyOperation(encryptedPrivateKey);
-                RemoteOperationResult storePrivateKeyResult = storePrivateKeyOperation.execute(account, getContext());
+                RemoteOperationResult storePrivateKeyResult = storePrivateKeyOperation.execute(account, getContext(),
+                        true);
 
                 if (storePrivateKeyResult.isSuccess()) {
                     Log_OC.d(TAG, "private key success");

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

@@ -1607,7 +1607,7 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
 
             ToggleEncryptionOperation toggleEncryptionOperation = new ToggleEncryptionOperation(event.localId,
                     event.remotePath, event.shouldBeEncrypted);
-            RemoteOperationResult remoteOperationResult = toggleEncryptionOperation.execute(mClient);
+            RemoteOperationResult remoteOperationResult = toggleEncryptionOperation.execute(mClient, true);
 
             if (remoteOperationResult.isSuccess()) {
                 mAdapter.setEncryptionAttributeForItemID(event.remoteId, event.shouldBeEncrypted);

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

@@ -210,7 +210,7 @@ public class EncryptionUtils {
     DecryptedFolderMetadata downloadFolderMetadata(OCFile folder, OwnCloudClient client,
                                                    Context context, Account account) {
         GetMetadataOperation getMetadataOperation = new GetMetadataOperation(folder.getLocalId());
-        RemoteOperationResult getMetadataOperationResult = getMetadataOperation.execute(client);
+        RemoteOperationResult getMetadataOperationResult = getMetadataOperation.execute(client, true);
 
         if (!getMetadataOperationResult.isSuccess()) {
             return null;

src/main/res/values/setup.xml

@@ -19,6 +19,7 @@
     <string name="log_name">nextcloud</string>
     <string name="default_display_name_for_root_folder">Nextcloud</string>
     <string name="user_agent">Mozilla/5.0 (Android) ownCloud-android/%1$s</string>
+    <string name="nextcloud_user_agent">Mozilla/5.0 (Android) Nextcloud-android/%1$s</string>
     
     <!-- URLs and flags related -->
     <string name="server_url"></string>