mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix after rebase

Browse source
This commit is contained in:
AndyScherzinger 2017-07-16 23:28:14 +02:00
parent 83deeb203c
commit 160feb9711
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/owncloud/android/jobs/NCJobCreator.java
View file

@ -22,6 +22,7 @@ package com.owncloud.android.jobs;
import com.evernote.android.job.Job; import com.evernote.android.job.Job;
import com.evernote.android.job.JobCreator; import com.evernote.android.job.JobCreator;
import com.owncloud.android.services.AccountRemovalJob;
/** /**
* Job creator for android-job * Job creator for android-job

4
src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java
View file

@ -48,10 +48,10 @@ import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.files.services.FileDownloader;
import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.jobs.AutoUploadJob;
import com.owncloud.android.lib.common.OwnCloudAccount; import com.owncloud.android.lib.common.OwnCloudAccount;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.services.AccountRemovalJob; import com.owncloud.android.services.AccountRemovalJob;
import com.owncloud.android.services.AutoUploadJob;
import com.owncloud.android.services.OperationsService; import com.owncloud.android.services.OperationsService;
import com.owncloud.android.ui.adapter.AccountListAdapter; import com.owncloud.android.ui.adapter.AccountListAdapter;
import com.owncloud.android.ui.adapter.AccountListItem; import com.owncloud.android.ui.adapter.AccountListItem;
@ -407,7 +407,7 @@ public class ManageAccountsActivity extends FileActivity
// store pending account removal // store pending account removal
ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver()); ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(getContentResolver());
arbitraryDataProvider.storeOrUpdateKeyValue(account, PENDING_FOR_REMOVAL, String.valueOf(true)); arbitraryDataProvider.storeOrUpdateKeyValue(account.name, PENDING_FOR_REMOVAL, String.valueOf(true));
// Cancel transfers // Cancel transfers
if (mUploaderBinder != null) { if (mUploaderBinder != null) {