Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused ApkDownloader.EVENT_APK_DOWNLOAD_CANCELLED

Browse Source 
This also removes all the related stuff that resulted in
EVENT_APK_DOWNLOAD_CANCELLED being sent. Since EVENT_APK_DOWNLOAD_CANCELLED
ultimately does nothing, that whole bit of plumbing is unused.
This commit is contained in:
Hans-Christoph Steiner 2016-03-29 12:21:56 +02:00
parent ab709e171a
commit d76d7aa367
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java
View File

@ -51,7 +51,6 @@ public class ApkDownloader implements AsyncDownloader.Listener {
private static final String TAG = "ApkDownloader"; private static final String TAG = "ApkDownloader";
public static final String EVENT_APK_DOWNLOAD_COMPLETE = "apkDownloadComplete"; public static final String EVENT_APK_DOWNLOAD_COMPLETE = "apkDownloadComplete";
public static final String EVENT_APK_DOWNLOAD_CANCELLED = "apkDownloadCancelled";
public static final String EVENT_ERROR = "apkDownloadError"; public static final String EVENT_ERROR = "apkDownloadError";
public static final String ACTION_STATUS = "apkDownloadStatus"; public static final String ACTION_STATUS = "apkDownloadStatus";
@ -257,11 +256,6 @@ public class ApkDownloader implements AsyncDownloader.Listener {
prepareApkFileAndSendCompleteMessage(); prepareApkFileAndSendCompleteMessage();
} }
@Override
public void onDownloadCancelled() {
sendMessage(EVENT_APK_DOWNLOAD_CANCELLED);
}
@Override @Override
public void onProgress(Event event) { public void onProgress(Event event) {
sendProgressEvent(event); sendProgressEvent(event);

6
app/src/main/java/org/fdroid/fdroid/net/AsyncDownloadWrapper.java
View File

@ -12,7 +12,6 @@ class AsyncDownloadWrapper extends Handler implements AsyncDownloader {
private static final String TAG = "AsyncDownloadWrapper"; private static final String TAG = "AsyncDownloadWrapper";
private static final int MSG_DOWNLOAD_COMPLETE = 2; private static final int MSG_DOWNLOAD_COMPLETE = 2;
private static final int MSG_DOWNLOAD_CANCELLED = 3;
private static final int MSG_ERROR = 4; private static final int MSG_ERROR = 4;
private static final String MSG_DATA = "data"; private static final String MSG_DATA = "data";
@ -61,9 +60,6 @@ class AsyncDownloadWrapper extends Handler implements AsyncDownloader {
case MSG_DOWNLOAD_COMPLETE: case MSG_DOWNLOAD_COMPLETE:
listener.onDownloadComplete(); listener.onDownloadComplete();
break; break;
case MSG_DOWNLOAD_CANCELLED:
listener.onDownloadCancelled();
break;
case MSG_ERROR: case MSG_ERROR:
listener.onErrorDownloading(message.getData().getString(MSG_DATA)); listener.onErrorDownloading(message.getData().getString(MSG_DATA));
break; break;
@ -77,7 +73,7 @@ class AsyncDownloadWrapper extends Handler implements AsyncDownloader {
downloader.download(); downloader.download();
sendMessage(MSG_DOWNLOAD_COMPLETE); sendMessage(MSG_DOWNLOAD_COMPLETE);
} catch (InterruptedException e) { } catch (InterruptedException e) {
sendMessage(MSG_DOWNLOAD_CANCELLED); // ignored
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, "I/O exception in download thread", e); Log.e(TAG, "I/O exception in download thread", e);
Bundle data = new Bundle(1); Bundle data = new Bundle(1);

2
app/src/main/java/org/fdroid/fdroid/net/AsyncDownloader.java
View File

@ -8,8 +8,6 @@ public interface AsyncDownloader {
void onErrorDownloading(String localisedExceptionDetails); void onErrorDownloading(String localisedExceptionDetails);
void onDownloadComplete(); void onDownloadComplete();
void onDownloadCancelled();
} }
int getBytesRead(); int getBytesRead();

2
app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
View File

@ -789,8 +789,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE: case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE:
handleDownloadComplete(downloader.localFile(), app.packageName); handleDownloadComplete(downloader.localFile(), app.packageName);
break; break;
case ApkDownloader.EVENT_ERROR:
break;
} }
} }
}); });