Clean FileDataStorageManager constructor

Author: abelgardep

owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt

@@ -42,26 +42,9 @@ import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-class FileDataStorageManager : KoinComponent {
-
-    private var contentResolver: ContentResolver? = null
-    private var contentProviderClient: ContentProviderClient? = null
-    var account: Account
-    private var mContext: Context? = null
-
-    constructor(activity: Context, account: Account, cr: ContentResolver) {
-        contentProviderClient = null
-        contentResolver = cr
-        this.account = account
-        mContext = activity
-    }
-
-    constructor(activity: Context, account: Account, cp: ContentProviderClient) {
-        contentProviderClient = cp
-        contentResolver = null
-        this.account = account
-        mContext = activity
-    }
+class FileDataStorageManager(
+    val account: Account,
+) : KoinComponent {
 
     fun getFileByPath(remotePath: String): OCFile? = getFileByPathAndAccount(remotePath, account.name)
 

owncloudApp/src/main/java/com/owncloud/android/providers/cursors/RootCursor.kt

@@ -32,7 +32,7 @@ import com.owncloud.android.domain.files.model.OCFile
 class RootCursor(projection: Array<String>?) : MatrixCursor(projection ?: DEFAULT_ROOT_PROJECTION) {
 
     fun addRoot(account: Account, context: Context) {
-        val manager = FileDataStorageManager(context, account, context.contentResolver)
+        val manager = FileDataStorageManager(account)
         val mainDir = manager.getFileByPath(OCFile.ROOT_PATH)
 
         val flags = Root.FLAG_SUPPORTS_SEARCH or Root.FLAG_SUPPORTS_CREATE

owncloudApp/src/main/java/com/owncloud/android/services/OperationsService.java

@@ -282,11 +282,7 @@ private void nextOperation() {
                             mOwnCloudClient = SingleSessionManager.getDefaultSingleton().
                                     getClientFor(ocAccount, mService);
 
-                            mStorageManager = new FileDataStorageManager(
-                                    mService,
-                                    mLastTarget.mAccount,
-                                    mService.getContentResolver()
-                            );
+                            mStorageManager = new FileDataStorageManager(mLastTarget.mAccount);
                         } else {
                             OwnCloudCredentials credentials = null;
                             ocAccount = new OwnCloudAccount(mLastTarget.mServerUrl, credentials);

owncloudApp/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -37,11 +37,11 @@
 import androidx.core.app.NotificationCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.owncloud.android.R;
-import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.domain.UseCaseResult;
 import com.owncloud.android.domain.capabilities.usecases.RefreshCapabilitiesFromServerAsyncUseCase;
 import com.owncloud.android.domain.exceptions.UnauthorizedException;
 import com.owncloud.android.domain.files.model.OCFile;
+import com.owncloud.android.domain.files.usecases.GetFileByRemotePathUseCase;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.usecases.synchronization.SynchronizeFolderUseCase;
 import com.owncloud.android.utils.NotificationUtils;
@@ -133,8 +133,6 @@ public synchronized void onPerformSync(Account account, Bundle extras,
         mLocalBroadcastManager = LocalBroadcastManager.getInstance(getContext());
 
         this.setAccount(account);
-        this.setContentProviderClient(providerClient);
-        this.setStorageManager(new FileDataStorageManager(getContext(), account, providerClient));
 
         try {
             this.initClientForCurrentAccount();
@@ -152,7 +150,14 @@ public synchronized void onPerformSync(Account account, Bundle extras,
         try {
             updateCapabilities();
             if (!mCancellation) {
-                synchronizeFolder(getStorageManager().getFileByPath(OCFile.ROOT_PATH));
+                @NotNull Lazy<GetFileByRemotePathUseCase> getFileByRemotePathUseCaseLazy =
+                        inject(GetFileByRemotePathUseCase.class);
+                GetFileByRemotePathUseCase.Params params = new GetFileByRemotePathUseCase.Params(OCFile.ROOT_PATH, account.name);
+
+                UseCaseResult<OCFile> useCaseResult = getFileByRemotePathUseCaseLazy.getValue().execute(params);
+                if (useCaseResult.getDataOrNull() != null) {
+                    synchronizeFolder(useCaseResult.getDataOrNull());
+                }
 
             } else {
                 Timber.d("Leaving synchronization before synchronizing the root folder because cancelation request");

owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java

@@ -173,7 +173,7 @@ protected void createAccount(boolean mandatoryCreation) {
      */
     protected void onAccountSet(boolean stateWasRecovered) {
         if (getAccount() != null) {
-            mStorageManager = new FileDataStorageManager(this, getAccount(), getContentResolver());
+            mStorageManager = new FileDataStorageManager(getAccount());
             Timber.d("Account set: %s", getAccount().name);
         } else {
             Timber.e("onAccountChanged was called with NULL account associated!");

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -120,7 +120,7 @@ protected void onAccountSet(boolean stateWasRecovered) {
     private void initAndShowListOfFilesFragment() {
         OCFile safeInitialFolder;
         if (getFile() == null) {
-            FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(this, getAccount(), getContentResolver());
+            FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(getAccount());
             safeInitialFolder = fileDataStorageManager.getFileByPath(OCFile.ROOT_PATH);
         } else {
             safeInitialFolder = getFile();