commit 458e49457a44ce7ac946b4a18391abc714fc4ffc
author Sudheer Shanka <sudheersai@google.com> Thu Aug 11 12:41:53 2016 -0700
committer Sudheer Shanka <sudheersai@google.com> Thu Aug 11 14:46:20 2016 -0700
tree ac41fd15370895945b6d13c7b5c6f0d898f4668a
parent 2889cf301bb9df5b4ba775d5a4e2e62733a9fa89

Remove code to append product and device names to download url.

And unregister network change receiver if download fails.

Bug: 30782619
Change-Id: I979554dd61cfe15d9eec58ec7bade748634a7e26

src/com/android/retaildemo/DownloadVideoTask.java

diff --git a/src/com/android/retaildemo/DownloadVideoTask.java b/src/com/android/retaildemo/DownloadVideoTask.java
index 2391980..fd211aa 100644
--- a/src/com/android/retaildemo/DownloadVideoTask.java
+++ b/src/com/android/retaildemo/DownloadVideoTask.java
@@ -26,7 +26,6 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
@@ -47,9 +46,6 @@
     private static final String TAG = "DownloadVideoTask";
     private static final boolean DEBUG = false;
 
-    private static final String URL_PARAMETER_PRODUCT = "product";
-    private static final String URL_PARAMETER_DEVICE = "device";
-
     private static final int MSG_CHECK_FOR_UPDATE = 1;
     private static final int MSG_DOWNLOAD_COMPLETE = 2;
     private static final int MSG_CLEANUP_DOWNLOAD_DIR = 3;
@@ -79,7 +75,6 @@
 
         mDlm = (DownloadManager) mContext.getSystemService(Context.DOWNLOAD_SERVICE);
         mDownloadUrl = mContext.getString(R.string.retail_demo_video_download_url);
-        appendProductDeviceParamsToUrl();
     }
 
     public void run() {
@@ -220,10 +215,6 @@
                         mContext.unregisterReceiver(mDownloadReceiver);
                         mDownloadReceiver = null;
                     }
-                    if (mNetworkChangeReceiver != null) {
-                        mContext.unregisterReceiver(mNetworkChangeReceiver);
-                        mNetworkChangeReceiver = null;
-                    }
                     final String fileUri = cursor.getString(
                             cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
                     mDownloadedPath = Uri.parse(fileUri).getPath();
@@ -238,6 +229,10 @@
             if (cursor != null) {
                 cursor.close();
             }
+            if (mNetworkChangeReceiver != null) {
+                mContext.unregisterReceiver(mNetworkChangeReceiver);
+                mNetworkChangeReceiver = null;
+            }
         }
         return false;
     }
@@ -256,15 +251,6 @@
         }
     };
 
-    private void appendProductDeviceParamsToUrl() {
-        mDownloadUrl = Uri.parse(mDownloadUrl)
-                .buildUpon()
-                .appendQueryParameter(URL_PARAMETER_PRODUCT, Build.PRODUCT)
-                .appendQueryParameter(URL_PARAMETER_DEVICE, Build.DEVICE)
-                .build()
-                .toString();
-    }
-
     private void showProgressDialog() {
         mProgressDialog = new ProgressDialog(
                 new ContextThemeWrapper(mContext, android.R.style.Theme_Material_Light_Dialog));