From e7f76705c84416ccc3dfe7e9961f48abdaa6d47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 10 Apr 2014 15:55:24 +0200 Subject: [PATCH] Move "receiver" and "address" into UpdateService.EXTRA_... --- src/org/fdroid/fdroid/UpdateService.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/org/fdroid/fdroid/UpdateService.java b/src/org/fdroid/fdroid/UpdateService.java index 201ab8d79..35b603aad 100644 --- a/src/org/fdroid/fdroid/UpdateService.java +++ b/src/org/fdroid/fdroid/UpdateService.java @@ -48,6 +48,9 @@ public class UpdateService extends IntentService implements ProgressListener { public static final int STATUS_ERROR = 2; public static final int STATUS_INFO = 3; + public static final String EXTRA_RECEIVER = "receiver"; + public static final String EXTRA_ADDRESS = "address"; + private ResultReceiver receiver = null; public UpdateService() { @@ -136,9 +139,10 @@ public class UpdateService extends IntentService implements ProgressListener { Intent intent = new Intent(context, UpdateService.class); UpdateReceiver receiver = new UpdateReceiver(new Handler()); receiver.setContext(context).setDialog(dialog); - intent.putExtra("receiver", receiver); - if (!TextUtils.isEmpty(address)) - intent.putExtra("address", address); + intent.putExtra(EXTRA_RECEIVER, receiver); + if (!TextUtils.isEmpty(address)) { + intent.putExtra(EXTRA_ADDRESS, address); + } context.startService(intent); return receiver; @@ -242,8 +246,8 @@ public class UpdateService extends IntentService implements ProgressListener { @Override protected void onHandleIntent(Intent intent) { - receiver = intent.getParcelableExtra("receiver"); - String address = intent.getStringExtra("address"); + receiver = intent.getParcelableExtra(EXTRA_RECEIVER); + String address = intent.getStringExtra(EXTRA_ADDRESS); long startTime = System.currentTimeMillis(); String errmsg = "";