Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test CreateFolderOperation without server #3624

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Test CreateFolderOperation without server #3624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebf22f6
test CreateFolderOperation without server
tobiasKaminsky Feb 14, 2019
6da3a07
update tests
tobiasKaminsky Dec 13, 2019
1e2cbff
fix during CI
tobiasKaminsky Dec 13, 2019
688a44d
remove annotation
tobiasKaminsky Dec 13, 2019
aaba0a8
Fix unittests
tobiasKaminsky Dec 19, 2019
fb969cc
wip
tobiasKaminsky Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/androidTest/java/com/owncloud/android/AbstractIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.account.UserAccountManagerImpl;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.FileDataStorageManagerImpl;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.OwnCloudClientFactory;
import com.owncloud.android.lib.common.accounts.AccountUtils;
Expand Down Expand Up @@ -88,7 +89,7 @@ public static void beforeAll() {
}

FileDataStorageManager getStorageManager() {
return new FileDataStorageManager(account, targetContext.getContentResolver());
return new FileDataStorageManagerImpl(account, targetContext.getContentResolver());
}

private static void createDummyFiles() throws IOException {
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.nextcloud.client.account.UserAccountManagerImpl;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.FileDataStorageManagerImpl;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.ui.activity.PassCodeActivity;
import com.owncloud.android.ui.activity.SettingsActivity;
Expand Down Expand Up @@ -585,7 +586,8 @@ private static String getFolderPreference(final Context context,
}

ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
FileDataStorageManager storageManager = new FileDataStorageManager(user.toPlatformAccount(), context.getContentResolver());
FileDataStorageManager storageManager = new FileDataStorageManagerImpl(user.toPlatformAccount(),
context);

String value = dataProvider.getValue(user.getAccountName(), getKeyFromFolder(preferenceName, folder));
OCFile prefFolder = folder;
Expand Down
Loading