Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 165efa2

Browse files
gotevgotev
committed
Refactoring to be able to use custom namespace configuration for the
UploadService
1 parent 7b67c66 commit 165efa2

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

‎src/com/alexbbb/uploadservice/AbstractUploadServiceReceiver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public abstract class AbstractUploadServiceReceiver extends BroadcastReceiver {
2222
public void onReceive(Context context, Intent intent) {
2323

2424
if (intent != null) {
25-
if (UploadService.BROADCAST_ACTION.equals(intent.getAction())) {
25+
if (UploadService.getActionBroadcast().equals(intent.getAction())) {
2626
final int status = intent.getIntExtra(UploadService.STATUS, 0);
2727
final String uploadId = intent.getStringExtra(UploadService.UPLOAD_ID);
2828

@@ -59,7 +59,7 @@ public void onReceive(Context context, Intent intent) {
5959
*/
6060
public void register(final Activity activity) {
6161
final IntentFilter intentFilter = new IntentFilter();
62-
intentFilter.addAction(UploadService.BROADCAST_ACTION);
62+
intentFilter.addAction(UploadService.getActionBroadcast());
6363
activity.registerReceiver(this, intentFilter);
6464
}
6565

‎src/com/alexbbb/uploadservice/UploadService.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class UploadService extends IntentService {
3838

3939
public static String NAMESPACE = "com.alexbbb";
4040

41-
protected static final String ACTION_UPLOAD = NAMESPACE + ".uploadservice.action.upload";
41+
private static final String ACTION_UPLOAD_SUFFIX = ".uploadservice.action.upload";
4242
protected static final String PARAM_NOTIFICATION_CONFIG = "notificationConfig";
4343
protected static final String PARAM_ID = "id";
4444
protected static final String PARAM_URL = "url";
@@ -47,7 +47,7 @@ public class UploadService extends IntentService {
4747
protected static final String PARAM_REQUEST_HEADERS = "requestHeaders";
4848
protected static final String PARAM_REQUEST_PARAMETERS = "requestParameters";
4949

50-
public static final String BROADCAST_ACTION = NAMESPACE + ".uploadservice.broadcast.status";
50+
private static final String BROADCAST_ACTION_SUFFIX = ".uploadservice.broadcast.status";
5151
public static final String UPLOAD_ID = "id";
5252
public static final String STATUS = "status";
5353
public static final int STATUS_IN_PROGRESS = 1;
@@ -64,6 +64,14 @@ public class UploadService extends IntentService {
6464
private UploadNotificationConfig notificationConfig;
6565
private int lastPublishedProgress;
6666

67+
public static String getActionUpload() {
68+
return NAMESPACE + ACTION_UPLOAD_SUFFIX;
69+
}
70+
71+
public static String getActionBroadcast() {
72+
return NAMESPACE + BROADCAST_ACTION_SUFFIX;
73+
}
74+
6775
/**
6876
* Utility method that creates the intent that starts the background file upload service.
6977
*
@@ -81,7 +89,7 @@ public static void startUpload(final UploadRequest task) throws IllegalArgumentE
8189

8290
final Intent intent = new Intent(UploadService.class.getName());
8391

84-
intent.setAction(ACTION_UPLOAD);
92+
intent.setAction(getActionUpload());
8593
intent.putExtra(PARAM_NOTIFICATION_CONFIG, task.getNotificationConfig());
8694
intent.putExtra(PARAM_ID, task.getUploadId());
8795
intent.putExtra(PARAM_URL, task.getServerUrl());
@@ -113,7 +121,7 @@ protected void onHandleIntent(Intent intent) {
113121
if (intent != null) {
114122
final String action = intent.getAction();
115123

116-
if (ACTION_UPLOAD.equals(action)) {
124+
if (getActionUpload().equals(action)) {
117125
notificationConfig = intent.getParcelableExtra(PARAM_NOTIFICATION_CONFIG);
118126
final String uploadId = intent.getStringExtra(PARAM_ID);
119127
final String url = intent.getStringExtra(PARAM_URL);
@@ -311,7 +319,7 @@ private void broadcastProgress(final String uploadId, final long uploadedBytes,
311319

312320
updateNotificationProgress(progress);
313321

314-
final Intent intent = new Intent(BROADCAST_ACTION);
322+
final Intent intent = new Intent(getActionBroadcast());
315323
intent.putExtra(UPLOAD_ID, uploadId);
316324
intent.putExtra(STATUS, STATUS_IN_PROGRESS);
317325
intent.putExtra(PROGRESS, progress);
@@ -332,7 +340,7 @@ private void broadcastCompleted(final String uploadId, final int responseCode, f
332340
else
333341
updateNotificationError();
334342

335-
final Intent intent = new Intent(BROADCAST_ACTION);
343+
final Intent intent = new Intent(getActionBroadcast());
336344
intent.putExtra(UPLOAD_ID, uploadId);
337345
intent.putExtra(STATUS, STATUS_COMPLETED);
338346
intent.putExtra(SERVER_RESPONSE_CODE, responseCode);
@@ -344,8 +352,8 @@ private void broadcastError(final String uploadId, final Exception exception) {
344352

345353
updateNotificationError();
346354

347-
final Intent intent = new Intent(BROADCAST_ACTION);
348-
intent.setAction(BROADCAST_ACTION);
355+
final Intent intent = new Intent(getActionBroadcast());
356+
intent.setAction(getActionBroadcast());
349357
intent.putExtra(UPLOAD_ID, uploadId);
350358
intent.putExtra(STATUS, STATUS_ERROR);
351359
intent.putExtra(ERROR_EXCEPTION, exception);

0 commit comments

Comments
 (0)