From 690c1bf128a01e196cc9faab195e437594d63995 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 15 Jan 2014 10:41:37 +0100 Subject: [PATCH] Removed unused methoed OnDatatransferProgressListener#onTransferProgress(long) --- .../android/oc_framework/sampleclient/MainActivity.java | 6 ------ .../network/webdav/OnDatatransferProgressListener.java | 1 - .../owncloud/android/files/services/FileDownloader.java | 16 ---------------- .../owncloud/android/files/services/FileUploader.java | 15 --------------- .../owncloud/android/ui/fragment/FileDetailFragment.java | 5 ----- .../android/ui/preview/FileDownloadFragment.java | 5 ----- 6 files changed, 48 deletions(-) diff --git a/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java b/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java index 5642554b..6f7d2168 100644 --- a/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java +++ b/oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java @@ -242,10 +242,4 @@ public class MainActivity extends Activity implements OnRemoteOperationListener, }); } - - @Override - public void onTransferProgress(long arg0) { - // TODO Remove from library - } - } diff --git a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OnDatatransferProgressListener.java b/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OnDatatransferProgressListener.java index f0180b7c..c08e8c6a 100644 --- a/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OnDatatransferProgressListener.java +++ b/oc_framework/src/com/owncloud/android/oc_framework/network/webdav/OnDatatransferProgressListener.java @@ -19,6 +19,5 @@ package com.owncloud.android.oc_framework.network.webdav; public interface OnDatatransferProgressListener { - public void onTransferProgress(long progressRate); public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileAbsoluteName); } diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 5d2a8246..0dee6050 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -282,13 +282,6 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis } } - - @Override - public void onTransferProgress(long progressRate) { - // old way, should not be in use any more - } - - @Override public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) { @@ -450,15 +443,6 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis /** - * Callback method to update the progress bar in the status notification (old version) - */ - @Override - public void onTransferProgress(long progressRate) { - // NOTHING TO DO HERE ANYMORE - } - - - /** * Updates the status notification with the result of a download operation. * * @param downloadResult Result of the download operation. diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 35952634..4b4de805 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -417,12 +417,6 @@ public class FileUploader extends Service implements OnDatatransferProgressListe @Override - public void onTransferProgress(long progressRate) { - // old way, should not be in use any more - } - - - @Override public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) { String key = buildRemoteName(mCurrentUpload.getAccount(), mCurrentUpload.getFile()); @@ -718,15 +712,6 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } /** - * Callback method to update the progress bar in the status notification - * (old version) - */ - @Override - public void onTransferProgress(long progressRate) { - // NOTHING TO DO HERE ANYMORE - } - - /** * Updates the status notification with the result of an upload operation. * * @param uploadResult Result of the upload operation. diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index e024bc67..ec43bd19 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -904,11 +904,6 @@ public class FileDetailFragment extends FileFragment implements } @Override - public void onTransferProgress(long progressRate) { - // old method, nothing here - }; - - @Override public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String filename) { int percent = (int)(100.0*((double)totalTransferredSoFar)/((double)totalToTransfer)); if (percent != mLastPercent) { diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index c18f84be..bacba8c9 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -353,11 +353,6 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene } @Override - public void onTransferProgress(long progressRate) { - // old method, nothing here - }; - - @Override public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String filename) { int percent = (int)(100.0*((double)totalTransferredSoFar)/((double)totalToTransfer)); if (percent != mLastPercent) { -- 2.11.0