diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index 95bd799906d2..3832ba3f07e4 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -798,7 +798,7 @@ public void setData(List<Object> objects, ExtendedListFragment.SearchType search
         }
 
         if (mStorageManager == null) {
-            mStorageManager = new FileDataStorageManagerImpl(user.toPlatformAccount(), activity.getContentResolver());
+            mStorageManager = new FileDataStorageManagerImpl(user.toPlatformAccount(), activity);
         }
 
         if (clear) {
diff --git a/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java
index f75d371d039d..564f174c1318 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java
@@ -44,6 +44,7 @@
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManagerImpl;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.Template;
 import com.owncloud.android.files.CreateFileFromTemplateOperation;
@@ -249,9 +250,9 @@ protected String doInBackground(Void... voids) {
                     OCFile temp = FileStorageUtils.fillOCFile((RemoteFile) newFileResult.getData().get(0));
 
                     if (chooseTemplateDialogFragmentWeakReference.get() != null) {
-                        FileDataStorageManager storageManager = new FileDataStorageManager(
+                        FileDataStorageManager storageManager = new FileDataStorageManagerImpl(
                             user.toPlatformAccount(),
-                            chooseTemplateDialogFragmentWeakReference.get().requireContext().getContentResolver());
+                            chooseTemplateDialogFragmentWeakReference.get().requireContext());
                         storageManager.saveFile(temp);
                         file = storageManager.getFileByPath(path);
 
diff --git a/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java
index 4be10da5cf11..764caea5af9f 100644
--- a/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java
+++ b/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java
@@ -47,6 +47,7 @@
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManagerImpl;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.Creator;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -253,9 +254,9 @@ protected String doInBackground(Void... voids) {
                         OCFile temp = FileStorageUtils.fillOCFile((RemoteFile) newFileResult.getData().get(0));
 
                         if (chooseTemplateDialogFragmentWeakReference.get() != null) {
-                            FileDataStorageManager storageManager = new FileDataStorageManager(
+                            FileDataStorageManager storageManager = new FileDataStorageManagerImpl(
                                 user.toPlatformAccount(),
-                                chooseTemplateDialogFragmentWeakReference.get().requireContext().getContentResolver());
+                                chooseTemplateDialogFragmentWeakReference.get().requireContext());
                             storageManager.saveFile(temp);
                             file = storageManager.getFileByPath(path);