Merge pull request #11050 from nextcloud/arbitrary-dao

Use Room DAO instead of ContentProvider for arbitrary data table access

app/src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java

@@ -27,6 +27,7 @@ import android.accounts.AccountManager;
 import com.nextcloud.test.RandomStringGenerator;
 import com.owncloud.android.AbstractOnServerIT;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.files.services.FileUploader;
@@ -93,7 +94,7 @@ public class EndToEndRandomIT extends AbstractOnServerIT {
 
     @BeforeClass
     public static void initClass() throws Exception {
-        arbitraryDataProvider = new ArbitraryDataProvider(targetContext.getContentResolver());
+        arbitraryDataProvider = new ArbitraryDataProviderImpl(targetContext);
         createKeys();
     }
 

app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt

@@ -26,7 +26,7 @@ import android.content.Intent
 import android.os.Looper
 import androidx.test.espresso.intent.rule.IntentsTestRule
 import com.owncloud.android.AbstractIT
-import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
 import com.owncloud.android.ui.activity.RequestCredentialsActivity
 import com.owncloud.android.ui.activity.SettingsActivity
 import com.owncloud.android.utils.EncryptionUtils
@@ -71,7 +71,7 @@ class SettingsActivityIT : AbstractIT() {
         }
         val intent = Intent()
         intent.putExtra(RequestCredentialsActivity.KEY_CHECK_RESULT, RequestCredentialsActivity.KEY_CHECK_RESULT_TRUE)
-        val arbitraryDataProvider = ArbitraryDataProvider(targetContext.contentResolver)
+        val arbitraryDataProvider = ArbitraryDataProviderImpl(targetContext)
         arbitraryDataProvider.storeOrUpdateKeyValue(user.accountName, EncryptionUtils.MNEMONIC, "Secret mnemonic")
         val sut = activityRule.launchActivity(null)
         sut.runOnUiThread {

app/src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt

@@ -26,7 +26,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 
 class ArbitraryDataProviderIT : AbstractIT() {
-    private val arbitraryDataProvider = ArbitraryDataProvider(targetContext.contentResolver)
+    private val arbitraryDataProvider = ArbitraryDataProviderImpl(targetContext)
 
     @Test
     fun testNull() {
@@ -56,11 +56,11 @@ class ArbitraryDataProviderIT : AbstractIT() {
     fun testBoolean() {
         val key = "DUMMY_KEY"
         var value = true
-        arbitraryDataProvider.storeOrUpdateKeyValue(user.accountName, key, value.toString())
+        arbitraryDataProvider.storeOrUpdateKeyValue(user.accountName, key, value)
         assertEquals(value, arbitraryDataProvider.getBooleanValue(user.accountName, key))
 
         value = false
-        arbitraryDataProvider.storeOrUpdateKeyValue(user.accountName, key, value.toString())
+        arbitraryDataProvider.storeOrUpdateKeyValue(user.accountName, key, value)
         assertEquals(value, arbitraryDataProvider.getBooleanValue(user.accountName, key))
     }
 

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java

@@ -48,6 +48,7 @@ import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
 import com.owncloud.android.AbstractIT;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.Creator;
@@ -390,9 +391,9 @@ public class DialogFragmentIT extends AbstractIT {
 
         String json = new Gson().toJson(directEditing);
 
-        new ArbitraryDataProvider(targetContext.getContentResolver()).storeOrUpdateKeyValue(user.getAccountName(),
-                                                                                            ArbitraryDataProvider.DIRECT_EDITING,
-                                                                                            json);
+        new ArbitraryDataProviderImpl(targetContext).storeOrUpdateKeyValue(user.getAccountName(),
+                                                                                                ArbitraryDataProvider.DIRECT_EDITING,
+                                                                                                json);
 
         // activate templates
         OCCapability capability = fda.getCapabilities();

app/src/debug/java/com/nextcloud/client/TestActivity.kt

@@ -30,7 +30,7 @@ import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.utils.EditorUtils
 import com.owncloud.android.R
 import com.owncloud.android.databinding.TestLayoutBinding
-import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.files.services.FileDownloader
@@ -146,7 +146,14 @@ class TestActivity :
 
     override fun getFileOperationsHelper(): FileOperationsHelper {
         if (!this::fileOperation.isInitialized) {
-            fileOperation = FileOperationsHelper(this, userAccountManager, connectivityServiceMock, EditorUtils(ArbitraryDataProvider(contentResolver)))
+            fileOperation = FileOperationsHelper(
+                this,
+                userAccountManager,
+                connectivityServiceMock,
+                EditorUtils(
+                    ArbitraryDataProviderImpl(baseContext)
+                )
+            )
         }
 
         return fileOperation

app/src/gplay/java/com/owncloud/android/utils/PushUtils.java

@@ -38,6 +38,7 @@ import com.nextcloud.client.preferences.AppPreferencesImpl;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.PushConfigurationState;
 import com.owncloud.android.datamodel.SignatureVerification;
 import com.owncloud.android.lib.common.OwnCloudAccount;
@@ -151,7 +152,7 @@ public final class PushUtils {
     private static void deleteRegistrationForAccount(Account account) {
         Context context = MainApp.getAppContext();
         OwnCloudAccount ocAccount;
-        arbitraryDataProvider = new ArbitraryDataProvider(MainApp.getAppContext().getContentResolver());
+        arbitraryDataProvider = new ArbitraryDataProviderImpl(MainApp.getAppContext());
 
         try {
             ocAccount = new OwnCloudAccount(account, context);
@@ -193,7 +194,7 @@ public final class PushUtils {
     }
 
     public static void pushRegistrationToServer(final UserAccountManager accountManager, final String token) {
-        arbitraryDataProvider = new ArbitraryDataProvider(MainApp.getAppContext().getContentResolver());
+        arbitraryDataProvider = new ArbitraryDataProviderImpl(MainApp.getAppContext());
 
         if (!TextUtils.isEmpty(MainApp.getAppContext().getResources().getString(R.string.push_server_url)) &&
                 !TextUtils.isEmpty(token)) {
@@ -418,7 +419,7 @@ public final class PushUtils {
 
         Account[] accounts = accountManager.getAccounts();
 
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
         String arbitraryValue;
         Gson gson = new Gson();
         PushConfigurationState pushArbitraryData;

app/src/main/AndroidManifest.xml

@@ -280,10 +280,6 @@
                 android:pathPrefix="/external_links"
                 android:readPermission="false"
                 android:writePermission="false" />
-            <path-permission
-                android:pathPrefix="/arbitrary_data"
-                android:readPermission="false"
-                android:writePermission="false" />
             <path-permission
                 android:pathPrefix="/virtual"
                 android:readPermission="false"

app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java

@@ -38,6 +38,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
@@ -148,7 +149,7 @@ public class UserAccountManagerImpl implements UserAccountManager {
         Account[] ocAccounts = getAccounts();
         Account defaultAccount = null;
 
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
 
         SharedPreferences appPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         String accountName = appPreferences.getString(PREF_SELECT_OC_ACCOUNT, null);

app/src/main/java/com/nextcloud/client/database/DatabaseModule.kt

@@ -23,11 +23,8 @@
 package com.nextcloud.client.database
 
 import android.content.Context
-import androidx.room.Room
 import com.nextcloud.client.core.Clock
-import com.nextcloud.client.database.migrations.RoomMigration
-import com.nextcloud.client.database.migrations.addLegacyMigrations
-import com.owncloud.android.db.ProviderMeta
+import com.nextcloud.client.database.dao.ArbitraryDataDao
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
@@ -37,13 +34,12 @@ class DatabaseModule {
 
     @Provides
     @Singleton
-    @Suppress("Detekt.SpreadOperator") // forced by Room API
     fun database(context: Context, clock: Clock): NextcloudDatabase {
-        return Room
-            .databaseBuilder(context, NextcloudDatabase::class.java, ProviderMeta.DB_NAME)
-            .addLegacyMigrations(clock)
-            .addMigrations(RoomMigration())
-            .fallbackToDestructiveMigration()
-            .build()
+        return NextcloudDatabase.getInstance(context, clock)
+    }
+
+    @Provides
+    fun arbitraryDataDao(nextcloudDatabase: NextcloudDatabase): ArbitraryDataDao {
+        return nextcloudDatabase.arbitraryDataDao()
     }
 }

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -22,8 +22,13 @@
 
 package com.nextcloud.client.database
 
+import android.content.Context
 import androidx.room.Database
+import androidx.room.Room
 import androidx.room.RoomDatabase
+import com.nextcloud.client.core.Clock
+import com.nextcloud.client.core.ClockImpl
+import com.nextcloud.client.database.dao.ArbitraryDataDao
 import com.nextcloud.client.database.entity.ArbitraryDataEntity
 import com.nextcloud.client.database.entity.CapabilityEntity
 import com.nextcloud.client.database.entity.ExternalLinkEntity
@@ -33,6 +38,8 @@ import com.nextcloud.client.database.entity.ShareEntity
 import com.nextcloud.client.database.entity.SyncedFolderEntity
 import com.nextcloud.client.database.entity.UploadEntity
 import com.nextcloud.client.database.entity.VirtualEntity
+import com.nextcloud.client.database.migrations.RoomMigration
+import com.nextcloud.client.database.migrations.addLegacyMigrations
 import com.owncloud.android.db.ProviderMeta
 
 @Database(
@@ -52,7 +59,32 @@ import com.owncloud.android.db.ProviderMeta
 )
 @Suppress("Detekt.UnnecessaryAbstractClass") // needed by Room
 abstract class NextcloudDatabase : RoomDatabase() {
+
+    abstract fun arbitraryDataDao(): ArbitraryDataDao
+
     companion object {
         const val FIRST_ROOM_DB_VERSION = 65
+        private var INSTANCE: NextcloudDatabase? = null
+
+        @JvmStatic
+        @Suppress("DeprecatedCallableAddReplaceWith")
+        @Deprecated("Here for legacy purposes, inject this class or use getInstance(context, clock) instead")
+        fun getInstance(context: Context): NextcloudDatabase {
+            return getInstance(context, ClockImpl())
+        }
+
+        @JvmStatic
+        fun getInstance(context: Context, clock: Clock): NextcloudDatabase {
+            if (INSTANCE == null) {
+                INSTANCE = Room
+                    .databaseBuilder(context, NextcloudDatabase::class.java, ProviderMeta.DB_NAME)
+                    .allowMainThreadQueries()
+                    .addLegacyMigrations(clock)
+                    .addMigrations(RoomMigration())
+                    .fallbackToDestructiveMigration()
+                    .build()
+            }
+            return INSTANCE!!
+        }
     }
 }

app/src/main/java/com/nextcloud/client/database/dao/ArbitraryDataDao.kt

@@ -0,0 +1,42 @@
+/*
+ * Nextcloud Android client application
+ *
+ *  @author Álvaro Brey
+ *  Copyright (C) 2022 Álvaro Brey
+ *  Copyright (C) 2022 Nextcloud GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.nextcloud.client.database.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import com.nextcloud.client.database.entity.ArbitraryDataEntity
+
+@Dao
+interface ArbitraryDataDao {
+    @Query("INSERT INTO arbitrary_data(cloud_id, `key`, value) VALUES(:accountName, :key, :value)")
+    fun insertValue(accountName: String, key: String, value: String?)
+
+    @Query("SELECT * FROM arbitrary_data WHERE cloud_id = :accountName AND `key` = :key LIMIT 1")
+    fun getByAccountAndKey(accountName: String, key: String): ArbitraryDataEntity?
+
+    @Query("UPDATE arbitrary_data SET value = :value WHERE cloud_id = :accountName AND `key` = :key ")
+    fun updateValue(accountName: String, key: String, value: String?)
+
+    @Query("DELETE FROM arbitrary_data WHERE cloud_id = :accountName AND `key` = :key")
+    fun deleteValue(accountName: String, key: String)
+}

app/src/main/java/com/nextcloud/client/database/migrations/LegacyMigrationHelper.java

@@ -41,6 +41,9 @@ public class LegacyMigrationHelper {
 
     private static final String TAG = LegacyMigrationHelper.class.getSimpleName();
 
+    public static final int ARBITRARY_DATA_TABLE_INTRODUCTION_VERSION = 20;
+
+
     private static final String ALTER_TABLE = "ALTER TABLE ";
     private static final String ADD_COLUMN = " ADD COLUMN ";
     private static final String INTEGER = " INTEGER, ";
@@ -176,7 +179,7 @@ public class LegacyMigrationHelper {
                     db.execSQL(ALTER_TABLE + ProviderMeta.ProviderTableMeta.FILE_TABLE_NAME +
                                    ADD_COLUMN + ProviderMeta.ProviderTableMeta.FILE_ENCRYPTED_NAME + " TEXT ");
                 }
-                if (oldVersion > FileContentProvider.ARBITRARY_DATA_TABLE_INTRODUCTION_VERSION) {
+                if (oldVersion > ARBITRARY_DATA_TABLE_INTRODUCTION_VERSION) {
                     if (!checkIfColumnExists(db, ProviderMeta.ProviderTableMeta.CAPABILITIES_TABLE_NAME,
                                              ProviderMeta.ProviderTableMeta.CAPABILITIES_END_TO_END_ENCRYPTION)) {
                         db.execSQL(ALTER_TABLE + ProviderMeta.ProviderTableMeta.CAPABILITIES_TABLE_NAME +

app/src/main/java/com/nextcloud/client/di/AppModule.java

@@ -39,7 +39,7 @@ import com.nextcloud.client.core.AsyncRunner;
 import com.nextcloud.client.core.Clock;
 import com.nextcloud.client.core.ClockImpl;
 import com.nextcloud.client.core.ThreadPoolAsyncRunner;
-import com.nextcloud.client.database.NextcloudDatabase;
+import com.nextcloud.client.database.dao.ArbitraryDataDao;
 import com.nextcloud.client.device.DeviceInfo;
 import com.nextcloud.client.logger.FileLogHandler;
 import com.nextcloud.client.logger.Logger;
@@ -56,9 +56,9 @@ import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.client.utils.Throttler;
 import com.owncloud.android.authentication.PassCodeManager;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.UploadsStorageManager;
-import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.ui.activities.data.activities.ActivitiesRepository;
 import com.owncloud.android.ui.activities.data.activities.ActivitiesServiceApi;
 import com.owncloud.android.ui.activities.data.activities.ActivitiesServiceApiImpl;
@@ -77,7 +77,6 @@ import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.room.Room;
 import dagger.Module;
 import dagger.Provides;
 
@@ -118,9 +117,8 @@ class AppModule {
     }
 
     @Provides
-    ArbitraryDataProvider arbitraryDataProvider(Context context) {
-        final ContentResolver resolver = context.getContentResolver();
-        return new ArbitraryDataProvider(resolver);
+    ArbitraryDataProvider arbitraryDataProvider(ArbitraryDataDao dao) {
+        return new ArbitraryDataProviderImpl(dao);
     }
 
     @Provides

app/src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt

@@ -38,6 +38,7 @@ import com.nextcloud.java.util.Optional
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.FilesystemDataProvider
 import com.owncloud.android.datamodel.PushConfigurationState
@@ -88,7 +89,7 @@ class AccountRemovalWork(
             return Result.failure()
         }
         val remoteWipe = inputData.getBoolean(REMOTE_WIPE, false)
-        val arbitraryDataProvider = ArbitraryDataProvider(context.contentResolver)
+        val arbitraryDataProvider: ArbitraryDataProvider = ArbitraryDataProviderImpl(context)
         val user = optionalUser.get()
         backgroundJobManager.cancelPeriodicContactsBackup(user)
         val userRemoved = userAccountManager.removeUser(user)

app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt

@@ -55,7 +55,6 @@ import java.io.FileWriter
 import java.io.IOException
 import java.io.InputStream
 import java.io.InputStreamReader
-import java.util.ArrayList
 import java.util.Calendar
 
 @Suppress("LongParameterList") // legacy code

app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt

@@ -36,6 +36,7 @@ import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
 import com.owncloud.android.datamodel.FilesystemDataProvider
 import com.owncloud.android.datamodel.MediaFolderType
 import com.owncloud.android.datamodel.SyncedFolder
@@ -133,8 +134,8 @@ class FilesSyncWork(
             return
         }
         val user = optionalUser.get()
-        val arbitraryDataProvider = if (lightVersion) {
-            ArbitraryDataProvider(contentResolver)
+        val arbitraryDataProvider: ArbitraryDataProvider? = if (lightVersion) {
+            ArbitraryDataProviderImpl(context)
         } else {
             null
         }

app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt

@@ -46,6 +46,7 @@ import com.nextcloud.client.preferences.AppPreferencesImpl
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
 import com.owncloud.android.datamodel.MediaFolderType
 import com.owncloud.android.datamodel.MediaFoldersModel
 import com.owncloud.android.datamodel.MediaProvider
@@ -84,7 +85,7 @@ class MediaFoldersDetectionWork constructor(
 
     @Suppress("LongMethod", "ComplexMethod", "NestedBlockDepth") // legacy code
     override fun doWork(): Result {
-        val arbitraryDataProvider = ArbitraryDataProvider(contentResolver)
+        val arbitraryDataProvider: ArbitraryDataProvider = ArbitraryDataProviderImpl(context)
         val syncedFolderProvider = SyncedFolderProvider(contentResolver, preferences, clock)
         val gson = Gson()
         val mediaFoldersModel: MediaFoldersModel

app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java

@@ -29,6 +29,7 @@ import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.account.UserAccountManagerImpl;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.activity.PassCodeActivity;
@@ -337,7 +338,7 @@ public final class AppPreferencesImpl implements AppPreferences {
             return defaultOrder;
         }
 
-        ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider dataProvider = new ArbitraryDataProviderImpl(context);
 
         String value = dataProvider.getValue(user.getAccountName(), PREF__FOLDER_SORT_ORDER + "_" + type);
 
@@ -347,7 +348,7 @@ public final class AppPreferencesImpl implements AppPreferences {
     @Override
     public void setSortOrder(FileSortOrder.Type type, FileSortOrder sortOrder) {
         User user = userAccountManager.getUser();
-        ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider dataProvider = new ArbitraryDataProviderImpl(context);
         dataProvider.storeOrUpdateKeyValue(user.getAccountName(), PREF__FOLDER_SORT_ORDER + "_" + type, sortOrder.name);
     }
 
@@ -604,7 +605,7 @@ public final class AppPreferencesImpl implements AppPreferences {
             return defaultValue;
         }
 
-        ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider dataProvider = new ArbitraryDataProviderImpl(context);
         FileDataStorageManager storageManager = new FileDataStorageManager(user, context.getContentResolver());
 
         String value = dataProvider.getValue(user.getAccountName(), getKeyFromFolder(preferenceName, folder));
@@ -629,7 +630,7 @@ public final class AppPreferencesImpl implements AppPreferences {
                                             final String preferenceName,
                                             @Nullable final OCFile folder,
                                             final String value) {
-        ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider dataProvider = new ArbitraryDataProviderImpl(context);
         dataProvider.storeOrUpdateKeyValue(user.getAccountName(), getKeyFromFolder(preferenceName, folder), value);
     }
 

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

@@ -62,6 +62,7 @@ import com.nextcloud.client.preferences.DarkMode;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.authentication.PassCodeManager;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.MediaFolder;
 import com.owncloud.android.datamodel.MediaFolderType;
 import com.owncloud.android.datamodel.MediaProvider;
@@ -413,7 +414,7 @@ public class MainApp extends MultiDexApplication implements HasAndroidInjector {
     }
 
     public static void initContactsBackup(UserAccountManager accountManager, BackgroundJobManager backgroundJobManager) {
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(mContext.getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(mContext);
         List<User> users = accountManager.getAllUsers();
         for (User user : users) {
             if (arbitraryDataProvider.getBooleanValue(user, PREFERENCE_CONTACTS_AUTOMATIC_BACKUP)) {

app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.java

@@ -1,238 +0,0 @@
-/*
- * Nextcloud Android client application
- *
- * Copyright (C) 2017 Tobias Kaminsky
- * Copyright (C) 2017 Mario Danic
- * Copyright (C) 2017 Nextcloud.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.datamodel;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-
-import com.nextcloud.client.account.User;
-import com.owncloud.android.db.ProviderMeta;
-import com.owncloud.android.lib.common.utils.Log_OC;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Database provider for handling the persistence aspects of arbitrary data table.
- */
-public class ArbitraryDataProvider {
-    public static final String DIRECT_EDITING = "DIRECT_EDITING";
-    public static final String DIRECT_EDITING_ETAG = "DIRECT_EDITING_ETAG";
-    public static final String PREDEFINED_STATUS = "PREDEFINED_STATUS";
-
-    private static final String TAG = ArbitraryDataProvider.class.getSimpleName();
-    private static final String TRUE = "true";
-
-    private ContentResolver contentResolver;
-
-    public ArbitraryDataProvider(ContentResolver contentResolver) {
-        if (contentResolver == null) {
-            throw new IllegalArgumentException("Cannot create an instance with a NULL contentResolver");
-        }
-        this.contentResolver = contentResolver;
-    }
-
-    public int deleteKeyForAccount(String account, String key) {
-        return contentResolver.delete(
-            ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
-            ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " = ? AND " +
-                ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY + "= ?",
-            new String[]{account, key}
-                                     );
-    }
-
-    public void storeOrUpdateKeyValue(String accountName, String key, long newValue) {
-        storeOrUpdateKeyValue(accountName, key, String.valueOf(newValue));
-    }
-
-    public void storeOrUpdateKeyValue(final String accountName, final String key, final boolean newValue) {
-        storeOrUpdateKeyValue(accountName, key, String.valueOf(newValue));
-    }
-
-    public void storeOrUpdateKeyValue(@NonNull String accountName,
-                                      @NonNull String key,
-                                      @Nullable String newValue) {
-        ArbitraryDataSet data = getArbitraryDataSet(accountName, key);
-
-        String value;
-        if (newValue == null) {
-            value = "";
-        } else {
-            value = newValue;
-        }
-
-        if (data == null) {
-            Log_OC.v(TAG, "Adding arbitrary data with cloud id: " + accountName + " key: " + key
-                + " value: " + value);
-
-            ContentValues cv = new ContentValues();
-            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID, accountName);
-            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY, key);
-            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE, value);
-
-            Uri result = contentResolver.insert(ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA, cv);
-
-            if (result == null) {
-                Log_OC.v(TAG, "Failed to store arbitrary data with cloud id: " + accountName + " key: " + key
-                    + " value: " + value);
-            }
-        } else {
-            Log_OC.v(TAG, "Updating arbitrary data with cloud id: " + accountName + " key: " + key
-                + " value: " + value);
-            ContentValues cv = new ContentValues();
-            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID, data.getCloudId());
-            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY, data.getKey());
-            cv.put(ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE, value);
-
-            int result = contentResolver.update(
-                    ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
-                    cv,
-                    ProviderMeta.ProviderTableMeta._ID + "=?",
-                    new String[]{String.valueOf(data.getId())}
-            );
-
-            if (result == 0) {
-                Log_OC.v(TAG, "Failed to update arbitrary data with cloud id: " + accountName + " key: " + key
-                    + " value: " + value);
-            }
-        }
-    }
-
-    Long getLongValue(String accountName, String key) {
-        String value = getValue(accountName, key);
-
-        if (value.isEmpty()) {
-            return -1L;
-        } else {
-            return Long.valueOf(value);
-        }
-    }
-
-
-    public Long getLongValue(User user, String key) {
-        return getLongValue(user.getAccountName(), key);
-    }
-
-    public boolean getBooleanValue(String accountName, String key) {
-        return TRUE.equalsIgnoreCase(getValue(accountName, key));
-    }
-
-    public boolean getBooleanValue(User user, String key) {
-        return getBooleanValue(user.getAccountName(), key);
-    }
-
-    /**
-     * returns integer if found else -1
-     *
-     * @param accountName name of account
-     * @param key key to get value for
-     * @return Integer specified by account and key
-     */
-    public Integer getIntegerValue(String accountName, String key) {
-        String value = getValue(accountName, key);
-
-        if (value.isEmpty()) {
-            return -1;
-        } else {
-            return Integer.valueOf(value);
-        }
-    }
-
-    /**
-     * Returns stored value as string or empty string
-     *
-     * @return string if value found or empty string
-     */
-    @NonNull
-    public String getValue(@Nullable User user, String key) {
-        return user != null ? getValue(user.getAccountName(), key) : "";
-    }
-
-    public String getValue(String accountName, String key) {
-        Cursor cursor = contentResolver.query(
-            ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
-            null,
-            ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " = ? and " +
-                ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY + " = ?",
-            new String[]{accountName, key},
-            null
-                                             );
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                String value = cursor.getString(cursor.getColumnIndexOrThrow(
-                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE));
-                if (value == null) {
-                    Log_OC.e(TAG, "Arbitrary value could not be created from cursor");
-                } else {
-                    cursor.close();
-                    return value;
-                }
-            }
-            cursor.close();
-            return "";
-        } else {
-            Log_OC.e(TAG, "DB error restoring arbitrary values.");
-        }
-
-        return "";
-    }
-
-    private ArbitraryDataSet getArbitraryDataSet(String accountName, String key) {
-        Cursor cursor = contentResolver.query(
-                ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
-                null,
-                ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " = ? and " +
-                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY + " = ?",
-                new String[]{accountName, key},
-                null
-        );
-
-        ArbitraryDataSet dataSet = null;
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                int id = cursor.getInt(cursor.getColumnIndexOrThrow(ProviderMeta.ProviderTableMeta._ID));
-                String dbAccount = cursor.getString(cursor.getColumnIndexOrThrow(
-                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID));
-                String dbKey = cursor.getString(cursor.getColumnIndexOrThrow(
-                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_KEY));
-                String dbValue = cursor.getString(cursor.getColumnIndexOrThrow(
-                        ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_VALUE));
-
-                if (id == -1) {
-                    Log_OC.e(TAG, "Arbitrary value could not be created from cursor");
-                } else {
-                    if (dbValue == null) {
-                        dbValue = "";
-                    }
-                    dataSet = new ArbitraryDataSet(id, dbAccount, dbKey, dbValue);
-                }
-            }
-            cursor.close();
-        } else {
-            Log_OC.e(TAG, "DB error restoring arbitrary values.");
-        }
-
-        return dataSet;
-    }
-}

app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.kt

@@ -0,0 +1,47 @@
+/*
+ * Nextcloud Android client application
+ *
+ *  @author Álvaro Brey
+ *  Copyright (C) 2022 Álvaro Brey
+ *  Copyright (C) 2022 Nextcloud GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.owncloud.android.datamodel
+
+import com.nextcloud.client.account.User
+
+@Suppress("Detekt.TooManyFunctions") // legacy interface, will get rid of `accountName` methods in the future
+interface ArbitraryDataProvider {
+    fun deleteKeyForAccount(account: String, key: String)
+
+    fun storeOrUpdateKeyValue(accountName: String, key: String, newValue: Long)
+    fun storeOrUpdateKeyValue(accountName: String, key: String, newValue: Boolean)
+    fun storeOrUpdateKeyValue(accountName: String, key: String, newValue: String)
+
+    fun getLongValue(accountName: String, key: String): Long
+    fun getLongValue(user: User, key: String): Long
+    fun getBooleanValue(accountName: String, key: String): Boolean
+    fun getBooleanValue(user: User, key: String): Boolean
+    fun getIntegerValue(accountName: String, key: String): Int
+    fun getValue(user: User?, key: String): String
+    fun getValue(accountName: String, key: String): String
+
+    companion object {
+        const val DIRECT_EDITING = "DIRECT_EDITING"
+        const val DIRECT_EDITING_ETAG = "DIRECT_EDITING_ETAG"
+        const val PREDEFINED_STATUS = "PREDEFINED_STATUS"
+    }
+}

app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProviderImpl.java

@@ -0,0 +1,148 @@
+/*
+ * Nextcloud Android client application
+ *
+ * Copyright (C) 2017 Tobias Kaminsky
+ * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Nextcloud.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.datamodel;
+
+import android.content.Context;
+
+import com.nextcloud.client.account.User;
+import com.nextcloud.client.database.NextcloudDatabase;
+import com.nextcloud.client.database.dao.ArbitraryDataDao;
+import com.nextcloud.client.database.entity.ArbitraryDataEntity;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Database provider for handling the persistence aspects of arbitrary data table.
+ * <p>
+ * Don't instantiate this class, inject the interface instead.
+ */
+public class ArbitraryDataProviderImpl implements ArbitraryDataProvider {
+
+    private static final String TRUE = "true";
+
+    private final ArbitraryDataDao arbitraryDataDao;
+
+    /**
+     * @deprecated inject interface instead
+     */
+    @Deprecated
+    public ArbitraryDataProviderImpl(final Context context) {
+        this(NextcloudDatabase.getInstance(context).arbitraryDataDao());
+    }
+
+    public ArbitraryDataProviderImpl(@NonNull final ArbitraryDataDao dao) {
+        this.arbitraryDataDao = dao;
+    }
+
+    @Override
+    public void deleteKeyForAccount(@NonNull String account, @NonNull String key) {
+        arbitraryDataDao.deleteValue(account, key);
+    }
+
+    @Override
+    public void storeOrUpdateKeyValue(@NonNull String accountName, @NonNull String key, long newValue) {
+        storeOrUpdateKeyValue(accountName, key, String.valueOf(newValue));
+    }
+
+    @Override
+    public void storeOrUpdateKeyValue(@NonNull final String accountName, @NonNull final String key, final boolean newValue) {
+        storeOrUpdateKeyValue(accountName, key, String.valueOf(newValue));
+    }
+
+    @Override
+    public void storeOrUpdateKeyValue(@NonNull String accountName,
+                                      @NonNull String key,
+                                      @Nullable String newValue) {
+        final ArbitraryDataEntity currentValue = arbitraryDataDao.getByAccountAndKey(accountName, key);
+        if (currentValue != null) {
+            arbitraryDataDao.updateValue(accountName, key, newValue);
+        } else {
+            arbitraryDataDao.insertValue(accountName, key, newValue);
+        }
+    }
+
+    @Override
+    public long getLongValue(@NonNull String accountName, @NonNull String key) {
+        String value = getValue(accountName, key);
+
+        if (value.isEmpty()) {
+            return -1L;
+        } else {
+            return Long.parseLong(value);
+        }
+    }
+
+
+    @Override
+    public long getLongValue(User user, @NonNull String key) {
+        return getLongValue(user.getAccountName(), key);
+    }
+
+    @Override
+    public boolean getBooleanValue(@NonNull String accountName, @NonNull String key) {
+        return TRUE.equalsIgnoreCase(getValue(accountName, key));
+    }
+
+    @Override
+    public boolean getBooleanValue(User user, @NonNull String key) {
+        return getBooleanValue(user.getAccountName(), key);
+    }
+
+    /**
+     * returns integer if found else -1
+     *
+     * @param accountName name of account
+     * @param key         key to get value for
+     * @return Integer specified by account and key
+     */
+    @Override
+    public int getIntegerValue(@NonNull String accountName, @NonNull String key) {
+        String value = getValue(accountName, key);
+
+        if (value.isEmpty()) {
+            return -1;
+        } else {
+            return Integer.parseInt(value);
+        }
+    }
+
+    /**
+     * Returns stored value as string or empty string
+     *
+     * @return string if value found or empty string
+     */
+    @Override
+    @NonNull
+    public String getValue(@Nullable User user, @NonNull String key) {
+        return user != null ? getValue(user.getAccountName(), key) : "";
+    }
+
+    @Override
+    @NonNull
+    public String getValue(@NonNull String accountName, @NonNull String key) {
+        final ArbitraryDataEntity entity = arbitraryDataDao.getByAccountAndKey(accountName, key);
+        if (entity == null || entity.getValue() == null) {
+            return "";
+        }
+        return entity.getValue();
+    }
+}

app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataSet.kt

@@ -1,27 +0,0 @@
-/*
- *
- * Nextcloud Android client application
- *
- * @author Tobias Kaminsky
- * Copyright (C) 2020 Tobias Kaminsky
- * Copyright (C) 2020 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.datamodel
-
-/**
- * Data set for [ArbitraryDataProvider]
- */
-internal class ArbitraryDataSet(val id: Int, val cloudId: String, val key: String, val value: String)

app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -1047,7 +1047,7 @@ public final class ThumbnailsCacheManager {
 
             String accountName = mUserId + "@" + mServerName;
 
-            ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(mContext.getContentResolver());
+            ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(mContext);
 
             String eTag = arbitraryDataProvider.getValue(accountName, ThumbnailsCacheManager.AVATAR);
             long timestamp = arbitraryDataProvider.getLongValue(accountName, ThumbnailsCacheManager.AVATAR_TIMESTAMP);

app/src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -72,8 +72,6 @@ public class ProviderMeta {
                 + MainApp.getAuthority() + "/synced_folders");
         public static final Uri CONTENT_URI_EXTERNAL_LINKS = Uri.parse(CONTENT_PREFIX
                 + MainApp.getAuthority() + "/external_links");
-        public static final Uri CONTENT_URI_ARBITRARY_DATA = Uri.parse(CONTENT_PREFIX
-                + MainApp.getAuthority() + "/arbitrary_data");
         public static final Uri CONTENT_URI_VIRTUAL = Uri.parse(CONTENT_PREFIX + MainApp.getAuthority() + "/virtual");
         public static final Uri CONTENT_URI_FILESYSTEM = Uri.parse(CONTENT_PREFIX
                 + MainApp.getAuthority() + "/filesystem");

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

@@ -26,6 +26,7 @@ import android.util.Pair;
 
 import com.nextcloud.client.account.User;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.DecryptedFolderMetadata;
 import com.owncloud.android.datamodel.EncryptedFolderMetadata;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -106,7 +107,7 @@ public class CreateFolderOperation extends SyncOperation implements OnRemoteOper
     }
 
     private RemoteOperationResult encryptedCreate(OCFile parent, OwnCloudClient client) {
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
         String privateKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PRIVATE_KEY);
         String publicKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PUBLIC_KEY);
 

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

@@ -28,6 +28,7 @@ import com.nextcloud.android.lib.resources.directediting.DirectEditingObtainRemo
 import com.nextcloud.client.account.User;
 import com.nextcloud.common.NextcloudClient;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.DecryptedFolderMetadata;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -296,7 +297,7 @@ public class RefreshFolderOperation extends RemoteOperation {
     }
 
     private void updateCapabilities() {
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(mContext.getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(mContext);
         String oldDirectEditingEtag = arbitraryDataProvider.getValue(user,
                                                                      ArbitraryDataProvider.DIRECT_EDITING_ETAG);
 

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

@@ -26,6 +26,7 @@ import android.content.Context;
 import com.google.gson.reflect.TypeToken;
 import com.nextcloud.client.account.User;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.DecryptedFolderMetadata;
 import com.owncloud.android.datamodel.EncryptedFolderMetadata;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -84,7 +85,7 @@ public class RemoveRemoteEncryptedFileOperation extends RemoteOperation {
         this.user = user;
         this.fileName = fileName;
 
-        arbitraryDataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
     }
 
     /**

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

@@ -33,6 +33,7 @@ import com.nextcloud.client.device.PowerManagementService;
 import com.nextcloud.client.network.Connectivity;
 import com.nextcloud.client.network.ConnectivityService;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.DecryptedFolderMetadata;
 import com.owncloud.android.datamodel.EncryptedFolderMetadata;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -455,7 +456,7 @@ public class UploadFileOperation extends SyncOperation {
         boolean metadataExists = false;
         String token = null;
 
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContext().getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(getContext());
 
         String privateKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PRIVATE_KEY);
         String publicKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PUBLIC_KEY);

app/src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -75,14 +75,12 @@ public class FileContentProvider extends ContentProvider {
     private static final int UPLOADS = 6;
     private static final int SYNCED_FOLDERS = 7;
     private static final int EXTERNAL_LINKS = 8;
-    private static final int ARBITRARY_DATA = 9;
     private static final int VIRTUAL = 10;
     private static final int FILESYSTEM = 11;
     private static final String TAG = FileContentProvider.class.getSimpleName();
     // todo avoid string concatenation and use string formatting instead later.
     private static final String ERROR = "ERROR ";
     private static final int SINGLE_PATH_SEGMENT = 1;
-    public static final int ARBITRARY_DATA_TABLE_INTRODUCTION_VERSION = 20;
     public static final int MINIMUM_PATH_SEGMENTS_SIZE = 1;
 
     private static final String[] PROJECTION_CONTENT_TYPE = new String[]{
@@ -160,9 +158,6 @@ public class FileContentProvider extends ContentProvider {
             case EXTERNAL_LINKS:
                 count = db.delete(ProviderTableMeta.EXTERNAL_LINKS_TABLE_NAME, where, whereArgs);
                 break;
-            case ARBITRARY_DATA:
-                count = db.delete(ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME, where, whereArgs);
-                break;
             case VIRTUAL:
                 count = db.delete(ProviderTableMeta.VIRTUAL_TABLE_NAME, where, whereArgs);
                 break;
@@ -361,16 +356,6 @@ public class FileContentProvider extends ContentProvider {
                 }
                 return insertedExternalLinkUri;
 
-            case ARBITRARY_DATA:
-                Uri insertedArbitraryDataUri;
-                long arbitraryDataId = db.insert(ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME, SQLiteDatabase.CONFLICT_REPLACE, values);
-                if (arbitraryDataId > 0) {
-                    insertedArbitraryDataUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
-                                                                          arbitraryDataId);
-                } else {
-                    throw new SQLException("ERROR " + uri);
-                }
-                return insertedArbitraryDataUri;
             case VIRTUAL:
                 Uri insertedVirtualUri;
                 long virtualId = db.insert(ProviderTableMeta.VIRTUAL_TABLE_NAME, SQLiteDatabase.CONFLICT_REPLACE, values);
@@ -456,7 +441,6 @@ public class FileContentProvider extends ContentProvider {
         mUriMatcher.addURI(authority, "uploads/#", UPLOADS);
         mUriMatcher.addURI(authority, "synced_folders", SYNCED_FOLDERS);
         mUriMatcher.addURI(authority, "external_links", EXTERNAL_LINKS);
-        mUriMatcher.addURI(authority, "arbitrary_data", ARBITRARY_DATA);
         mUriMatcher.addURI(authority, "virtual", VIRTUAL);
         mUriMatcher.addURI(authority, "filesystem", FILESYSTEM);
 
@@ -525,9 +509,6 @@ public class FileContentProvider extends ContentProvider {
             case EXTERNAL_LINKS:
                 tableName = ProviderTableMeta.EXTERNAL_LINKS_TABLE_NAME;
                 break;
-            case ARBITRARY_DATA:
-                tableName = ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME;
-                break;
             case VIRTUAL:
                 tableName = ProviderTableMeta.VIRTUAL_TABLE_NAME;
                 break;
@@ -567,9 +548,6 @@ public class FileContentProvider extends ContentProvider {
                 case EXTERNAL_LINKS:
                     order = ProviderTableMeta.EXTERNAL_LINKS_NAME;
                     break;
-                case ARBITRARY_DATA:
-                    order = ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID;
-                    break;
                 case VIRTUAL:
                     order = ProviderTableMeta.VIRTUAL_TYPE;
                     break;
@@ -659,8 +637,6 @@ public class FileContentProvider extends ContentProvider {
                 return db.update(ProviderTableMeta.UPLOADS_TABLE_NAME, SQLiteDatabase.CONFLICT_REPLACE, values, selection, selectionArgs);
             case SYNCED_FOLDERS:
                 return db.update(ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME, SQLiteDatabase.CONFLICT_REPLACE, values, selection, selectionArgs);
-            case ARBITRARY_DATA:
-                return db.update(ProviderTableMeta.ARBITRARY_DATA_TABLE_NAME, SQLiteDatabase.CONFLICT_REPLACE, values, selection, selectionArgs);
             case FILESYSTEM:
                 return db.update(ProviderTableMeta.FILESYSTEM_TABLE_NAME, SQLiteDatabase.CONFLICT_REPLACE, values, selection, selectionArgs);
             default:
@@ -699,7 +675,6 @@ public class FileContentProvider extends ContentProvider {
             case UPLOADS:
             case SYNCED_FOLDERS:
             case EXTERNAL_LINKS:
-            case ARBITRARY_DATA:
             case VIRTUAL:
             case FILESYSTEM:
                 String callingPackage = mContext.getPackageManager().getNameForUid(Binder.getCallingUid());

app/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java

@@ -40,6 +40,7 @@ import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -377,7 +378,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
     @Override
     @SuppressFBWarnings("IOI_USE_OF_FILE_STREAM_CONSTRUCTORS") // TODO remove with API26
     public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContext().getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(getContext());
 
         String userId = uri.getQueryParameter("shareWith");
         String displayName = uri.getQueryParameter("displayName");

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -51,7 +51,6 @@ import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.webkit.URLUtil;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -78,6 +77,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.PassCodeManager;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.ExternalLinksProvider;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.ExternalLink;
@@ -907,7 +907,7 @@ public abstract class DrawerActivity extends ToolbarActivity
         }
 
         externalLinksProvider = new ExternalLinksProvider(getContentResolver());
-        arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
+        arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
     }
 
     @Override

app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -50,6 +50,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
@@ -644,7 +645,7 @@ public abstract class FileActivity extends DrawerActivity
 
     public void checkForNewDevVersionNecessary(Context context) {
         if (getResources().getBoolean(R.bool.dev_version_direct_download_enabled)) {
-            ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
+            ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
             int count = arbitraryDataProvider.getIntegerValue(FilesSyncHelper.GLOBAL, APP_OPENED_COUNT);
 
             if (count > 10 || count == -1) {

app/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -48,6 +48,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;
@@ -142,7 +143,7 @@ public class ManageAccountsActivity extends FileActivity implements UserListAdap
             originalCurrentUser = currentUser.get().getAccountName();
         }
 
-        arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
+        arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
 
         multipleAccountsSupported = getResources().getBoolean(R.bool.multiaccount_support);
 
@@ -426,7 +427,7 @@ public class ManageAccountsActivity extends FileActivity implements UserListAdap
         }
 
         // store pending account removal
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
         arbitraryDataProvider.storeOrUpdateKeyValue(user.getAccountName(), PENDING_FOR_REMOVAL, String.valueOf(true));
 
         // Cancel transfers

app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java

@@ -38,6 +38,7 @@ import com.nextcloud.java.util.Optional;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.NotificationsLayoutBinding;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
@@ -146,7 +147,7 @@ public class NotificationsActivity extends DrawerActivity implements Notificatio
                                          R.string.push_notifications_not_implemented,
                                          Snackbar.LENGTH_INDEFINITE);
             } else {
-                final ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
+                final ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
                 final String accountName = optionalUser.isPresent() ? optionalUser.get().getAccountName() : "";
                 final boolean usesOldLogin = arbitraryDataProvider.getBooleanValue(accountName,
                                                                                    UserAccountManager.ACCOUNT_USES_STANDARD_PASSWORD);

app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -62,6 +62,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.ExternalLinksProvider;
 import com.owncloud.android.datastorage.DataStorageProvider;
 import com.owncloud.android.datastorage.StoragePoint;
@@ -606,7 +607,7 @@ public class SettingsActivity extends PreferenceActivity
             preferenceScreen.removePreference(preferenceCategorySyncedFolders);
         } else {
             // Upload on WiFi
-            final ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
+            final ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
 
             final SwitchPreference pUploadOnWifiCheckbox = (SwitchPreference) findPreference("synced_folder_on_wifi");
             pUploadOnWifiCheckbox.setChecked(
@@ -872,7 +873,7 @@ public class SettingsActivity extends PreferenceActivity
                                  RequestCredentialsActivity.KEY_CHECK_RESULT_FALSE) ==
                 RequestCredentialsActivity.KEY_CHECK_RESULT_TRUE) {
 
-                ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
+                ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
                 String mnemonic = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.MNEMONIC);
 
                 AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.FallbackTheming_Dialog);

app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt

@@ -48,7 +48,7 @@ import com.owncloud.android.BuildConfig
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.databinding.SyncedFoldersLayoutBinding
-import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
 import com.owncloud.android.datamodel.MediaFolder
 import com.owncloud.android.datamodel.MediaFolderType
 import com.owncloud.android.datamodel.MediaProvider
@@ -696,14 +696,16 @@ class SyncedFoldersActivity :
                 backgroundJobManager.startImmediateFilesSyncJob(skipCustomFolders = false, overridePowerSaving = false)
             } else {
                 val syncedFolderInitiatedKey = KEY_SYNCED_FOLDER_INITIATED_PREFIX + item.id
-                val arbitraryDataProvider = ArbitraryDataProvider(MainApp.getAppContext().contentResolver)
+                val arbitraryDataProvider =
+                    ArbitraryDataProviderImpl(MainApp.getAppContext())
                 arbitraryDataProvider.deleteKeyForAccount("global", syncedFolderInitiatedKey)
             }
         }
     }
 
     private fun storeSyncedFolder(item: SyncedFolderDisplayItem) {
-        val arbitraryDataProvider = ArbitraryDataProvider(MainApp.getAppContext().contentResolver)
+        val arbitraryDataProvider =
+            ArbitraryDataProviderImpl(MainApp.getAppContext())
         val storedId = syncedFolderProvider.storeSyncedFolder(item)
         if (storedId != -1L) {
             item.id = storedId

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

@@ -36,6 +36,7 @@ import com.nextcloud.client.di.Injectable;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.SetupEncryptionDialogBinding;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -132,7 +133,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment implements Inj
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         user = getArguments().getParcelable(ARG_USER);
 
-        arbitraryDataProvider = new ArbitraryDataProvider(getContext().getContentResolver());
+        arbitraryDataProvider = new ArbitraryDataProviderImpl(getContext());
 
         // Inflate the layout for the dialog
         LayoutInflater inflater = getActivity().getLayoutInflater();

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

@@ -33,6 +33,7 @@ import com.owncloud.android.R;
 import com.owncloud.android.databinding.FileListActionsBottomSheetCreatorBinding;
 import com.owncloud.android.databinding.FileListActionsBottomSheetFragmentBinding;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.Creator;
 import com.owncloud.android.lib.common.DirectEditing;
@@ -103,7 +104,7 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog implements In
             binding.templates.setVisibility(View.VISIBLE);
         }
 
-        String json = new ArbitraryDataProvider(getContext().getContentResolver())
+        String json = new ArbitraryDataProviderImpl(getContext())
             .getValue(user, ArbitraryDataProvider.DIRECT_EDITING);
 
         if (!json.isEmpty() &&

app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -55,6 +55,7 @@ import com.nextcloud.utils.EditorUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.StreamMediaFileOperation;
@@ -1120,7 +1121,7 @@ public class FileOperationsHelper {
     }
 
     public static boolean isEndToEndEncryptionSetup(Context context, User user) {
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
 
         String publicKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PUBLIC_KEY);
         String privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY);

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

@@ -69,6 +69,7 @@ import com.nextcloud.client.preferences.AppPreferences;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
@@ -491,7 +492,7 @@ public final class DisplayUtils {
             ((View) callContext).setContentDescription(String.valueOf(user.toPlatformAccount().hashCode()));
         }
 
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
 
         final String accountName = user.getAccountName();
         String serverName = accountName.substring(accountName.lastIndexOf('@') + 1);

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

@@ -31,6 +31,7 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.nextcloud.client.account.User;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.DecryptedFolderMetadata;
 import com.owncloud.android.datamodel.EncryptedFolderMetadata;
 import com.owncloud.android.datamodel.OCFile;
@@ -231,7 +232,7 @@ public final class EncryptionUtils {
         }
 
         // decrypt metadata
-        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(context.getContentResolver());
+        ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
         String serializedEncryptedMetadata = (String) getMetadataOperationResult.getData().get(0);
         String privateKey = arbitraryDataProvider.getValue(user.getAccountName(), EncryptionUtils.PRIVATE_KEY);