X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a07937cb6f1d2a19d526e7fcb666c8e66515620d..4984d909f21ca2eb45d730b280249578cb766a06:/src/com/owncloud/android/ui/activity/FileDisplayActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index d980553b..086e10a9 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1,6 +1,6 @@ /* ownCloud Android client application * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2012-2014 ownCloud Inc. + * Copyright (C) 2012-2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -96,7 +96,6 @@ import com.owncloud.android.operations.RefreshFolderOperation; import com.owncloud.android.operations.UnshareLinkOperation; import com.owncloud.android.services.observer.FileObserverService; import com.owncloud.android.syncadapter.FileSyncAdapter; -import com.owncloud.android.ui.adapter.FileListListAdapter; import com.owncloud.android.ui.dialog.CreateFolderDialogFragment; import com.owncloud.android.ui.dialog.SslUntrustedCertDialog; import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener; @@ -649,6 +648,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { if (filePaths != null) { String[] remotePaths = new String[filePaths.length]; String remotePathBase = ""; + for (int j = mDirectories.getCount() - 2; j >= 0; --j) { remotePathBase += OCFile.PATH_SEPARATOR + mDirectories.getItem(j); } @@ -1262,7 +1262,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { */ private class DownloadFinishReceiver extends BroadcastReceiver { - int refreshCounter = 0; + //int refreshCounter = 0; @Override public void onReceive(Context context, Intent intent) { try { @@ -1273,7 +1273,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { if (sameAccount && isDescendant) { String linkedToRemotePath = intent.getStringExtra(FileDownloader.EXTRA_LINKED_TO_PATH); if (linkedToRemotePath == null || isAscendant(linkedToRemotePath)) { - Log_OC.v(TAG, "NOW: refresh #" + ++refreshCounter); + //Log_OC.v(TAG, "refresh #" + ++refreshCounter); refreshListOfFilesFragment(); } refreshSecondFragment( @@ -1892,6 +1892,10 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { onTransferStateChanged(file, false, false); } + public void cancelUploadsForAnAccount(Account account) { + mUploaderBinder.cancel(account); + } + @Override public void onRefresh(boolean ignoreETag) { refreshList(ignoreETag);